瀏覽代碼

fix for linking order on linux

Former-commit-id: 0442044541fc3a36b67b6fbe5c7aa37dd406ffa0
Daniele Panozzo 10 年之前
父節點
當前提交
5459825114
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 0 6
      tutorial/CMakeLists.shared
  2. 6 0
      tutorial/CMakeLists.txt

+ 0 - 6
tutorial/CMakeLists.shared

@@ -109,10 +109,4 @@ set(SHARED_LIBRARIES
 #		${GLFW_LIBRARIES}
 )
 
-# This is necessary to work around the static linking order dependencies on linux
-if(UNIX AND NOT APPLE)
-  set(SHARED_LIBRARIES ${SHARED_LIBRARIES} ${SHARED_LIBRARIES})
-endif(UNIX AND NOT APPLE)
-
-#message(FATAL_ERROR ${SHARED_LIBRARIES})
 endif(NOT CMAKELISTS_SHARED_INCLUDED)

+ 6 - 0
tutorial/CMakeLists.txt

@@ -46,6 +46,12 @@ list(APPEND SHARED_LIBRARIES "nanogui" "glfw")
 message(STATUS "Linking with: ${LIBIGL_LIBRARIES}")
 list(APPEND SHARED_LIBRARIES ${LIBIGL_LIBRARIES})
 
+# This is necessary to work around the static linking order dependencies on linux
+if(UNIX AND NOT APPLE)
+  set(SHARED_LIBRARIES ${SHARED_LIBRARIES} ${SHARED_LIBRARIES})
+endif(UNIX AND NOT APPLE)
+
+#message(FATAL_ERROR ${SHARED_LIBRARIES})
 
 # Chapter 1
 add_subdirectory("101_FileIO")