rsys

commit 3a81a4e989750dc0d8bd02c307970446dcc08333
parent ae7b2d43d44938c906e53ba10d5c04e13a057852
Author: vaplv <vaplv@free.fr>
Date:   Mon, 27 Nov 2017 10:09:04 +0100

Remove the BUILD_STATIC CMake option

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

1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -19,7 +19,6 @@ enable_testing()
 
 set(RSYS_SOURCE_DIR ${PROJECT_SOURCE_DIR}/../src)
 option(NO_TEST "Disable the test" OFF)
-option(BUILD_STATIC "Build RSys as static library" OFF)
 
 ################################################################################
 # Check dependencies
@@ -129,23 +128,13 @@ rcmake_prepend_path(RSYS_FILES_INC ${RSYS_SOURCE_DIR})
 rcmake_prepend_path(RSYS_FILES_INC_API ${RSYS_SOURCE_DIR})
 rcmake_prepend_path(RSYS_FILES_DOC ${PROJECT_SOURCE_DIR}/../)
 
-if(BUILD_STATIC)
-  add_library(rsys STATIC
-    ${RSYS_FILES_SRC}
-    ${RSYS_FILES_SRC_THREAD}
-    ${RSYS_FILES_INC}
-    ${RSYS_FILES_INC_API})
-  set_target_properties(rsys PROPERTIES COMPILE_DEFINITIONS RSYS_STATIC_BUILD)
-else()
-  add_library(rsys SHARED
-    ${RSYS_FILES_SRC}
-    ${RSYS_FILES_SRC_THREAD}
-    ${RSYS_FILES_INC}
-    ${RSYS_FILES_INC_API})
-  set_target_properties(rsys PROPERTIES DEFINE_SYMBOL RSYS_SHARED_BUILD)
-endif()
-
-set_target_properties(rsys PROPERTIES
+add_library(rsys SHARED
+  ${RSYS_FILES_SRC}
+  ${RSYS_FILES_SRC_THREAD}
+  ${RSYS_FILES_INC}
+  ${RSYS_FILES_INC_API})
+set_target_properties(rsys 
+  PROPERTIES DEFINE_SYMBOL RSYS_SHARED_BUILD
   DEFINE_SYMBOL RSYS_SHARED_BUILD
   VERSION ${VERSION}
   SOVERSION ${VERSION_MAJOR})