commit 78c3c7bd36ed5eaa3424987f90a897bfd4fd03e1
parent bec50a4d86613036eca695fb41683c65c444d6a6
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Wed, 5 Oct 2016 16:47:37 +0200
Fix compilation as a static library on the CL compiler
Diffstat:
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -76,7 +76,7 @@ endif()
if(BUILD_STATIC)
add_library(ssf STATIC ${SSF_FILES_INC} ${SSF_FILES_SRC})
- set_target_properties(ssf PROPERTIES DEFINE_SYMBOL SSF_STATIC)
+ set_target_properties(ssf PROPERTIES COMPILE_DEFINITIONS SSF_STATIC_BUILD)
else()
add_library(ssf SHARED ${SSF_FILES_INC} ${SSF_FILES_SRC})
target_link_libraries(ssf RSys StarSP ${MATH_LIB})
@@ -95,6 +95,7 @@ if(NOT NO_TEST)
function(new_test _name)
add_executable(${_name} ${SSF_SOURCE_DIR}/${_name}.c)
+ set_target_properties(${_name} PROPERTIES COMPILE_DEFINITIONS SSF_STATIC_BUILD)
target_link_libraries(${_name} ssf RSys StarSP ${MATH_LIB})
add_test(${_name} ${_name})
endfunction()
@@ -112,6 +113,8 @@ if(NOT NO_TEST)
new_test(test_ssf_microfacet_distribution)
new_test(test_ssf_microfacet_reflection)
new_test(test_ssf_specular_reflection)
+
+ rcmake_copy_runtime_libraries(test_ssf_beckmann_distribution)
endif()
################################################################################