Merge pull request #56 from pppppass/master

Update CMakeLists.txt

Author: Shlw

Collision/CMakeLists.txt

@@ -47,6 +47,10 @@ OPTION(HINT_GLFW3_FOUND "Switch to hint for glfw3" OFF)
 SET(HINT_GLFW3_INCLUDE_DIR "" CACHE STRING "Include directories hinting for glfw3")
 SET(HINT_GLFW3_LIBRARY "" CACHE STRING "Library names hinting for glfw3")
 
+OPTION(HINT_GLM_FOUND "Switch to hint for glm" OFF)
+SET(HINT_GLM_INCLUDE_DIR "" CACHE STRING "Include directories hinting for glm")
+SET(HINT_GLM_LIBRARY "" CACHE STRING "Library names hinting for glm")
+
 OPTION(HINT_OPENAL_FOUND "Switch to hint for OpenAL" OFF)
 SET(HINT_OPENAL_INCLUDE_DIR "" CACHE STRING "Include directories hinting for OpenAL")
 SET(HINT_OPENAL_LIBRARY "" CACHE STRING "Library names hinting for OpenAL")
@@ -225,6 +229,43 @@ IF (NOT HINT_GLFW3_FOUND AND NOT GLFW3_FOUND AND NOT PC_GLFW3_FOUND AND NOT PC_G
     MESSAGE(FATAL_ERROR "Cannot find the glfw3 library.")
 ENDIF ()
 
+IF (HINT_GLM_FOUND)
+    INCLUDE_DIRECTORIES(${HINT_GLM_INCLUDE_DIR})
+    TARGET_LINK_LIBRARIES(${COLLISION_EXE_NAME} ${HINT_GLM_LIBRARY})
+    IF (CMAKE_WITH_DEBUG)
+        MESSAGE(STATUS "glm found by HINT mode.")
+    ENDIF ()
+ENDIF ()
+IF (NOT HINT_GLM_FOUND AND PKGCONFIG_FOUND)
+    PKG_SEARCH_MODULE(PC_GLM glm GLM)
+    IF ((BUILD_WITH_STATIC STREQUAL "ON") AND PC_GLM_STATIC_FOUND)
+        INCLUDE_DIRECTORIES(${PC_GLM_STATIC_INCLUDE_DIRS})
+        TARGET_LINK_LIBRARIES(${COLLISION_EXE_NAME} ${PC_GLM_STATIC_LIBRARIES})
+        IF (CMAKE_WITH_DEBUG)
+            MESSAGE(STATUS "glm found by PC-STATIC mode.")
+        ENDIF ()
+    ELSEIF (PC_GLM_FOUND)
+        INCLUDE_DIRECTORIES(${PC_GLM_INCLUDE_DIRS})
+        TARGET_LINK_LIBRARIES(${COLLISION_EXE_NAME} ${PC_GLM_LIBRARIES})
+        IF (CMAKE_WITH_DEBUG)
+            MESSAGE(STATUS "glm found by PC mode.")
+        ENDIF ()
+    ENDIF ()
+ENDIF ()
+IF (NOT HINT_GLM_FOUND AND NOT PC_GLM_FOUND)
+    FIND_PACKAGE(GLM)
+    IF (GLM_FOUND)
+        INCLUDE_DIRECTORIES(${GLM_INCLUDE_DIR})
+        TARGET_LINK_LIBRARIES(${COLLISION_EXE_NAME} ${GLM_LIBRARY})
+        IF (CMAKE_WITH_DEBUG)
+            MESSAGE(STATUS "glm found by CMAKE mode.")
+        ENDIF ()
+    ENDIF ()
+ENDIF ()
+IF (NOT HINT_GLM_FOUND AND NOT GLM_FOUND AND NOT PC_GLM_FOUND AND NOT PC_GLM_STATIC_FOUND)
+    MESSAGE(FATAL_ERROR "Cannot find the glm library.")
+ENDIF ()
+
 IF (HINT_OPENAL_FOUND)
     INCLUDE_DIRECTORIES(${HINT_OPENAL_INCLUDE_DIR})
     TARGET_LINK_LIBRARIES(${COLLISION_EXE_NAME} ${HINT_OPENAL_LIBRARY})
@@ -305,10 +346,12 @@ IF (BUILD_WITH_STATIC)
     SET_TARGET_PROPERTIES(${COLLISION_EXE_NAME} PROPERTIES LINK_FLAGS -static)
 ENDIF ()
 
-SET_TARGET_PROPERTIES(${COLLISION_EXE_NAME} PROPERTIES COMPILE_FLAGES -O2)
+SET_TARGET_PROPERTIES(${COLLISION_EXE_NAME} PROPERTIES LINK_FLAGS "-Wl,-rpath,.")
+
+SET_TARGET_PROPERTIES(${COLLISION_EXE_NAME} PROPERTIES COMPILE_FLAGS -O2)
 
 IF (BUILD_WITH_DEBUG)
-    SET_TARGET_PROPERTIES(${COLLISION_EXE_NAME} PROPERTIES COMPILE_FLAGES -g)
+    SET_TARGET_PROPERTIES(${COLLISION_EXE_NAME} PROPERTIES COMPILE_FLAGS -g)
 ENDIF ()
 
 # Do miscellaneous things for the target

Collision/Readme.md

@@ -8,6 +8,10 @@ modeling, rendering and collision detection.
 
 ## Changelog and Note
 
+* lzh @ 2016.12.22.23.17
+  1. Update CMakeLists.txt to add search of glm, fix -O2 flags and add
+  *RPATH*.
+
 * lzh @ 2016.12.21.18.11
   1. Update CMakeLists.txt.