Quellcode durchsuchen

target library name adjustment

Johannes Ruehle vor 12 Jahren
Ursprung
Commit
a8890da9a8
3 geänderte Dateien mit 9 neuen und 5 gelöschten Zeilen
  1. 2 1
      CMakeLists.txt
  2. 5 2
      core/algebra/progs/CMakeLists.txt
  3. 2 2
      core/basics/progs/CMakeLists.txt

+ 2 - 1
CMakeLists.txt

@@ -40,7 +40,8 @@ set(OPENCV_LIB_INSTALL_PATH lib)
 INCLUDE_DIRECTORIES(".")
 INCLUDE_DIRECTORIES(core)
 
-set(the_module "libnice")
+#set(the_module "libnice")
+set(the_module "nice")
 
 set(NICE_CURR_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 SUBDIRLIST(__listSubDirs "${NICE_CURR_DIR}")

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

@@ -1,10 +1,13 @@
 
 ADD_EXECUTABLE(testILSConjugateGradients testILSConjugateGradients.cpp)
+ADD_EXECUTABLE(testILSmethods testILSmethods.cpp)
 #ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
 
-message(STATUS "boost_Libraries: ${Boost_LIBRARIES}")
-TARGET_LINK_LIBRARIES(testILSConjugateGradients libnice_core_algebra libnice_core_basics ${Boost_LIBRARIES})
+#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(testMemoryUsage libnice_core_basics libnice_core_vector)
 
 INSTALL(TARGETS testILSConjugateGradients DESTINATION bin)
+INSTALL(TARGETS testILSmethods DESTINATION bin)
 #INSTALL(TARGETS testMemoryUsage DESTINATION bin)

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

@@ -2,8 +2,8 @@
 ADD_EXECUTABLE(testConfig testConfig.cpp)
 ADD_EXECUTABLE(testMemoryUsage testMemoryUsage.cpp) 
 
-TARGET_LINK_LIBRARIES(testConfig libnice_core_basics)
-TARGET_LINK_LIBRARIES(testMemoryUsage libnice_core_basics)
+TARGET_LINK_LIBRARIES(testConfig nice_core_basics)
+TARGET_LINK_LIBRARIES(testMemoryUsage nice_core_basics)
 
 INSTALL(TARGETS testConfig DESTINATION bin)
 INSTALL(TARGETS testMemoryUsage DESTINATION bin)