polygon

commit bd62b74c0cf79dbe956b28fc221de26d3b8cb09e
parent f18fbdf1a4ec85fb597d58ac7a13601f31bb4e2a
Author: vaplv <vaplv@free.fr>
Date:   Fri, 24 Nov 2017 10:10:06 +0100

Upd the static build

Diffstat:
M
cmake/CMakeLists.txt
 | 
19
+++++++++----------

1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -17,8 +17,8 @@ cmake_minimum_required(VERSION 2.8)
 project(polygon C)
 enable_testing()
 
-option(BUILD_STATIC "Build library as static rather than shared" OFF)
 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)
 
@@ -56,17 +56,16 @@ endif()
 
 if(BUILD_STATIC)
   add_library(polygon STATIC ${POLYGON_FILES_SRC} ${POLYGON_FILES_INC})
-  set_target_properties(polygon PROPERTIES DEFINE_SYMBOL POLYGON_STATIC_BUILD)
+  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
-    VERSION ${VERSION}
-    SOVERSION ${VERSION_MAJOR})
-  target_link_libraries(polygon ${MATH_LIB})
+  set_target_properties(polygon PROPERTIES DEFINE_SYMBOL POLYGON_SHARED_BUILD)
 endif()
-target_link_libraries(polygon RSys)
+
+set_target_properties(polygon PROPERTIES
+  VERSION ${VERSION}
+  SOVERSION ${VERSION_MAJOR})
+target_link_libraries(polygon RSys ${MATH_LIB})
 
 rcmake_setup_devel(polygon Polygon ${VERSION} polygon_version.h)
 
@@ -75,7 +74,7 @@ rcmake_setup_devel(polygon Polygon ${VERSION} polygon_version.h)
 ################################################################################
 if(NOT NO_TEST)
   function(new_test _name)
-    add_executable(${_name} 
+    add_executable(${_name}
       ${POLYGON_SOURCE_DIR}/${_name}.c
       ${POLYGON_SOURCE_DIR}/test_polygon_utils.h)
     target_link_libraries(${_name} polygon ${MATH_LIB})