commit 1e8ba69255e2a6c44ef98f7e6840c9967d523099 parent f648bd10916ba375e5bcfd2f8b0af37b29050a14 Author: vaplv <vaplv@free.fr> Date: Mon, 27 Nov 2017 10:07:57 +0100 Remove the BUILD_STATIC CMake option Diffstat:
| M | cmake/CMakeLists.txt | | | 12 | ++---------- |
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt @@ -18,7 +18,6 @@ project(polygon C) enable_testing() option(NO_TEST "Do not compile the test pograms" OFF) -option(BUILD_STATIC "Build polygon as static library" OFF) set(POLYGON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src) @@ -27,7 +26,6 @@ set(POLYGON_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src) ################################################################################ find_package(RCMake REQUIRED) find_package(RSys 0.6 REQUIRED) -include_directories(${RSys_INCLUDE_DIR}) set(CMAKE_MODULE_PATH ${RCMAKE_SOURCE_DIR}) include(rcmake) @@ -54,15 +52,9 @@ if(CMAKE_COMPILER_IS_GNUCC) set(MATH_LIB m) endif() -if(BUILD_STATIC) - add_library(polygon STATIC ${POLYGON_FILES_SRC} ${POLYGON_FILES_INC}) - set_target_properties(polygon PROPERTIES COMPILE_DEFINITIONS POLYGON_STATIC_BUILD) -else() - add_library(polygon SHARED ${POLYGON_FILES_SRC} ${POLYGON_FILES_INC}) - set_target_properties(polygon PROPERTIES DEFINE_SYMBOL POLYGON_SHARED_BUILD) -endif() - +add_library(polygon SHARED ${POLYGON_FILES_SRC} ${POLYGON_FILES_INC}) set_target_properties(polygon PROPERTIES + DEFINE_SYMBOL POLYGON_SHARED_BUILD VERSION ${VERSION} SOVERSION ${VERSION_MAJOR}) target_link_libraries(polygon RSys ${MATH_LIB})