rsys

commit ae7b2d43d44938c906e53ba10d5c04e13a057852
parent c2a2acca0ebd7941cffc5d14edc96708e9eb441c
Author: vaplv <vaplv@free.fr>
Date:   Fri, 24 Nov 2017 15:30:34 +0100

Update the static build CMake configuration

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

1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -13,7 +13,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this CMake script. If not, see <http://www.gnu.org/licenses/>.
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.0)
 project(rsys C)
 enable_testing()
 
@@ -135,22 +135,21 @@ if(BUILD_STATIC)
     ${RSYS_FILES_SRC_THREAD}
     ${RSYS_FILES_INC}
     ${RSYS_FILES_INC_API})
-  set_target_properties(rsys PROPERTIES
-    COMPILE_DEFINITIONS RSYS_STATIC_BUILD
-    VERSION ${VERSION}
-    SOVERSION ${VERSION_MAJOR})
+  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
-    VERSION ${VERSION}
-    SOVERSION ${VERSION_MAJOR})
+  set_target_properties(rsys PROPERTIES DEFINE_SYMBOL RSYS_SHARED_BUILD)
 endif()
 
+set_target_properties(rsys PROPERTIES
+  DEFINE_SYMBOL RSYS_SHARED_BUILD
+  VERSION ${VERSION}
+  SOVERSION ${VERSION_MAJOR})
+
 target_link_libraries(rsys ${CMAKE_THREAD_LIBS_INIT})
 if(CMAKE_COMPILER_IS_GNUCC)
   target_link_libraries(rsys m)