cmake

Author: nlichtenberg

CMakeLists.txt

@@ -23,10 +23,57 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     set(CMAKE_CXX_FLAGS "-std=c++0x")
 endif()
 
+# Build KoRE library
 file(GLOB_RECURSE SOURCES src/KoRE/*.cpp)
 file(GLOB_RECURSE HEADER src/KoRE/*.h)
 add_library(KoRE ${SOURCES} ${HEADER})
 include_directories(src)
+include_directories(D:/GitHub/KoRE/ext/include/tinyxml)
+include_directories(demos/contrib)
+
+# Build Clipper library (?!)
+file(GLOB_RECURSE SOURCES ext/contrib/clipper/*.cpp)
+file(GLOB_RECURSE HEADER ext/contrib/clipper/*.hpp)
+add_library(clipper ${SOURCES} ${HEADER})
+
+# Build Tinyxml library (?!)
+#file(GLOB_RECURSE SOURCES ext/include/tinyxml/*.cpp)
+#file(GLOB_RECURSE HEADER ext/include/tinyxml/*.h)
+#add_library(tinyxml ${SOURCES} ${HEADER})
+#include_directories( ext/include/tinyxml)
+
+# Build poly2Tri library (?!)
+file(GLOB_RECURSE SOURCES ext/contrib/poly2tri/poly2tri/*.cpp)
+file(GLOB_RECURSE HEADER ext/contrib/poly2tri/poly2tri/*.h)
+#add_library(p2t ${SOURCES} ${HEADER})
+#SET_TARGET_PROPERTIES(p2t PROPERTIES LINKER_LANGUAGE C)
+
+
+
+######### 
+# Link external libraries to KoRE
+set(CMAKE_LIBRARY_PATH ${CMAKE_SOURCE_DIR}/lib)
+link_directories(${CMAKE_LIBRARY_PATH})
+include_directories(${CMAKE_LIBRARY_PATH})
+	    
+add_library( glew32 STATIC IMPORTED)        
+set_target_properties( glew32 PROPERTIES IMPORTED_LOCATION ${CMAKE_LIBRARY_PATH}/libglew32.dll.a )
+target_link_libraries(KoRE glew32)
+
+add_library( assimp STATIC IMPORTED)        
+set_target_properties( assimp PROPERTIES IMPORTED_LOCATION ${CMAKE_LIBRARY_PATH}/libassimp.a )
+target_link_libraries(KoRE assimp) 
+
+#add_library( tinyxml STATIC IMPORTED)        
+#set_target_properties( tinyxml PROPERTIES IMPORTED_LOCATION ${CMAKE_LIBRARY_PATH}/tinyxml.lib)
+#target_link_libraries(KoRE tinyxml)
+
+target_link_libraries(KoRE opengl32) 
+target_link_libraries(KoRE clipper) 
+target_link_libraries(KoRE p2t) 
+
+ 
+##########
 
 set(IGNORE "-build/include")
 
@@ -43,7 +90,7 @@ if(WIN32)
   add_definitions(-DGLFW_INCLUDE_GL3)
 endif()
 
-set(CMAKE_LIBRARY_PATH  "${CMAKE_SOURCE_DIR}/lib")
+set(CMAKE_LIBRARY_PATH  ${CMAKE_SOURCE_DIR}/lib)
 
 #if(MSVC)
 #  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ext/include)

demos/MainGLFW/CMakeLists.txt

@@ -2,12 +2,6 @@ file(GLOB_RECURSE SOURCES *.cpp)
 
 add_executable(MainGLFW ${SOURCES})
 
-#linking against a custom library
-target_link_libraries(MainGLFW D:/GitHub/KoRE/lib Assimp32d.dll)
-target_link_libraries(MainGLFW D:/GitHub/KoRE/lib assimp)
-target_link_libraries(MainGLFW D:/GitHub/KoRE/lib tinyxml.a)
-target_link_libraries(MainGLFW D:/GitHub/KoRE/lib glew32.a)
-target_link_libraries(MainGLFW D:/GitHub/KoRE/lib glfw.a)
 
 
 if(WIN32)
@@ -25,19 +19,34 @@ if(WIN32)
 	  )
 	else()
 	#MinGW
-		  set(KoRE_LIBS
+	    link_directories(${CMAKE_LIBRARY_PATH})
+	    include_directories(${CMAKE_LIBRARY_PATH})
+	    
+        #add_library( glew32 STATIC IMPORTED)        
+        #set_target_properties( glew32 PROPERTIES IMPORTED_LOCATION ${CMAKE_LIBRARY_PATH}/libglew32.a )
+        
+        #add_library( assimp STATIC IMPORTED)        
+        #set_target_properties( assimp PROPERTIES IMPORTED_LOCATION ${CMAKE_LIBRARY_PATH}/libassimp.a )
+        
+        #add_library( tinyxml STATIC IMPORTED)        
+        #set_target_properties( tinyxml PROPERTIES IMPORTED_LOCATION ${CMAKE_LIBRARY_PATH}/libtinyxml.a)
+	    
+		set(KoRE_LIBS
+		#${EXT_LIBS}/assimp.a
 	    #${EXT_LIBS}/libglfw.a
-	    #${EXT_LIBS}/glew32.lib
+	    #${EXT_LIBS}/libglew32.a
 	    #${EXT_LIBS}/libglew32.a
 	    #${EXT_LIBS}/assimp_debug-dll_win32/assimp.lib
 	    #OpenGL32
 	    #glaux
 	    #glu32
+	    #assimp
 	    opengl32
 	    glfw
 	    glew32
 	    tinyxml
 	    KoRE 
+	    #p2t
 	    )
 
 
@@ -47,7 +56,6 @@ else()
   set(KoRE_LIBS glfw GL GLEW KoRE assimp)
 endif(WIN32)
 
-
-
+target_link_libraries(MainGLFW tinyxml)
 target_link_libraries(MainGLFW ${KoRE_LIBS})