commit 76e8adc7725b81e18401abd1f31fd36ef1c63928
parent b5cd17fd6e7b65acdc44ceb01b102f711289bb29
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Thu, 7 Jan 2016 11:00:46 +0100
Minor changes in the CMake script
Add runtime directories to the test_sstl_load program.
Diffstat:
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -74,12 +74,6 @@ set_target_properties(sstl PROPERTIES
VERSION ${VERSION}
SOVERSION ${VERSION_MAJOR})
-if(MSVC)
- # The CL compiler does not support the strtok_r POSIX function but proposes
- # the strtok_s function that have the same profile and does the same thing.
- set_target_properties(sstl PROPERTIES COMPILE_FLAGS "/Dstrtok_r=strtok_s")
-endif()
-
rcmake_setup_devel(sstl StarSTL ${VERSION} sstl_version.h)
################################################################################
@@ -89,12 +83,12 @@ if(NOT NO_TEST)
add_executable(test_sstl ${SSTL_SOURCE_DIR}/test_sstl.c)
target_link_libraries(test_sstl sstl)
add_test(test_sstl test_sstl)
+ rcmake_set_test_runtime_dirs(test_sstl _runtime_dirs)
add_executable(test_sstl_load ${SSTL_SOURCE_DIR}/test_sstl_load.c)
target_link_libraries(test_sstl_load sstl)
add_test(test_sstl_load test_sstl)
-
- rcmake_set_test_runtime_dirs(test_sstl _runtime_dirs)
+ rcmake_set_test_runtime_dirs(test_sstl_load _runtime_dirs)
endif(NOT NO_TEST)
################################################################################