Jelajahi Sumber

CMake now cares about BUILD_SHARED_LIBS

Clemens-A. Brust 11 tahun lalu
induk
melakukan
d6eddc0192
2 mengubah file dengan 1 tambahan dan 3 penghapusan
  1. 0 2
      CMakeLists.txt
  2. 1 1
      cmake/NiceModules.cmake

+ 0 - 2
CMakeLists.txt

@@ -29,8 +29,6 @@ endif()
 
 set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR})
 
-set(NICE_BUILD_LIBS_STATIC_SHARED STATIC)
-
 set(NICE_SOURCEFILES_FIND_GLOBALLYRECURSIVE ON CACHE STRING "Scan a sublibraries directory for source files instead of using an explicit src file list")
 
 NICE_OPTION(WITH_BOOST "Build with Boost support" OFF)

+ 1 - 1
cmake/NiceModules.cmake

@@ -121,7 +121,7 @@ macro(nice_get_source_files)
 endmacro()
 
 macro(nice_build_library)
-  ADD_LIBRARY("nice_${the_library}" ${NICE_BUILD_LIBS_STATIC_SHARED} ${nice_${the_library}_HDR} ${nice_${the_library}_SRC})
+  ADD_LIBRARY("nice_${the_library}" ${nice_${the_library}_HDR} ${nice_${the_library}_SRC})
   TARGET_LINK_LIBRARIES("nice_${the_library}" ${nice_${the_library}_LINKING_DEPENDENCIES})
   #TARGET_LINK_LIBRARIES("nice_${the_library}" ${nice_${the_library}_LINKING_DEPENDENCIES} ${Boost_LIBRARIES} ${OPENGL_LIBRARY} ${GLUT_LIBRARY} ${QT_LIBRARIES})
   SET_PROPERTY(TARGET "nice_${the_library}" PROPERTY FOLDER "library")