From 1fcfc8d00d8c8aba5a16f495e7c914e6b5196c2c Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 20 Aug 2018 14:31:54 +0200 Subject: [PATCH] CMP0050: make Measure module aware of cmake policy --- src/Mod/Measure/App/CMakeLists.txt | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index 2f3a26f734..4270ef90b8 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -53,20 +53,15 @@ if(BUILD_USE_PCH) ADD_MSVC_PRECOMPILED_HEADER(Measure PreCompiled.h PreCompiled.cpp Measure_CPP_SRCS) endif(BUILD_USE_PCH) -# Set special compiler flag to convert a SIGSEV into an exception -# to handle issue #0000478. -IF(MSVC) -ENDIF(MSVC) - -add_library(Measure SHARED ${Measure_SRCS} ) -target_link_libraries(Measure ${Measure_LIBS}) - SET(Measure_Scripts - Init.py + ../Init.py ) -fc_target_copy_resource(Measure - ${CMAKE_SOURCE_DIR}/src/Mod/Measure +add_library(Measure SHARED ${Measure_SRCS} ${Measure_Scripts}) +target_link_libraries(Measure ${Measure_LIBS}) + +fc_target_copy_resource_flat(Measure + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Measure ${Measure_Scripts})