commit 70b124f1879e37bd2aaedde91ed3ff2049dab662
parent 53a795b3ca8b18a5b440df4b89691e59d84e86e8
Author: vaplv <vaplv@free.fr>
Date: Wed, 27 May 2015 10:17:30 +0200
Make the library compliant with the CL compiler
Diffstat:
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -30,13 +30,16 @@ include_directories(${RSys_INCLUDE_DIR})
set(CMAKE_MODULE_PATH ${RCMAKE_SOURCE_DIR})
include(rcmake)
+include(rcmake_runtime)
+
+rcmake_append_runtime_dirs(_runtime_dirs RSys)
################################################################################
# Define targets
################################################################################
set(VERSION_MAJOR 0)
set(VERSION_MINOR 0)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
set(POLYGON_FILES_SRC polygon.c)
@@ -44,16 +47,21 @@ set(POLYGON_FILES_INC polygon.h)
rcmake_prepend_path(POLYGON_FILES_SRC ${POLYGON_SOURCE_DIR})
rcmake_prepend_path(POLYGON_FILES_INC ${POLYGON_SOURCE_DIR})
+if(CMAKE_COMPILER_IS_GNUCC)
+ set(MATH_LIB m)
+endif(CMAKE_COMPILER_IS_GNUCC)
+
if(BUILD_STATIC)
add_library(polygon STATIC ${POLYGON_FILES_SRC} ${POLYGON_FILES_INC})
set_target_properties(polygon PROPERTIES DEFINE_SYMBOL POLYGON_STATIC_BUILD)
else(BUILD_STATIC)
+
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 m)
+ target_link_libraries(polygon ${MATH_LIB})
endif(BUILD_STATIC)
target_link_libraries(polygon RSys)
@@ -63,8 +71,9 @@ rcmake_setup_devel(polygon Polygon ${VERSION} polygon_version.h)
# Define tests
################################################################################
add_executable(test_polygon ${POLYGON_SOURCE_DIR}/test_polygon.c)
-target_link_libraries(test_polygon polygon m)
+target_link_libraries(test_polygon polygon ${MATH_LIB})
add_test(test_polygon test_polygon)
+rcmake_set_test_runtime_dirs(test_polygon _runtime_dirs)
################################################################################
# Install directories