瀏覽代碼

fixed static linking to boost library

Johannes R 12 年之前
父節點
當前提交
847af38bdc
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 0
      CMakeLists.txt
  2. 2 2
      core/algebra/progs/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -15,6 +15,7 @@ set(NICE_BUILD_LIBS_STATIC_SHARED STATIC)
 
 set(NICE_BUILD_PROGS 1)
 
+set(Boost_USE_STATIC_LIBS ON)
 FIND_PACKAGE(Boost COMPONENTS date_time filesystem)
 IF (Boost_FOUND)
 	message(STATUS "boost-incl-dir: ${Boost_INCLUDE_DIRS}")

+ 2 - 2
core/algebra/progs/CMakeLists.txt

@@ -4,8 +4,8 @@ ADD_EXECUTABLE(testILSmethods testILSmethods.cpp)
 #ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
 
 #message(STATUS "boost_Libraries: ${Boost_LIBRARIES}")
-TARGET_LINK_LIBRARIES(testILSConjugateGradients nice_core )#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
-TARGET_LINK_LIBRARIES(testILSmethods nice_core )#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(testILSConjugateGradients nice_core ${Boost_LIBRARIES})#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(testILSmethods nice_core ${Boost_LIBRARIES})#nice_core_algebra nice_core_basics ${Boost_LIBRARIES})
 #TARGET_LINK_LIBRARIES(testMemoryUsage libnice_core_basics libnice_core_vector)
 
 INSTALL(TARGETS testILSConjugateGradients DESTINATION bin)