From 958f906892ec59a8575b85f939164bc435212420 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 12 Feb 2018 17:17:27 +0100 Subject: cmake: remove otr_prop() It's too complex to be understood when written in CMake. Replace with explicit calls to set_property(). This hasn't been tested on OSX. --- x-plane-plugin/CMakeLists.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'x-plane-plugin') diff --git a/x-plane-plugin/CMakeLists.txt b/x-plane-plugin/CMakeLists.txt index db712590..32ec16e2 100644 --- a/x-plane-plugin/CMakeLists.txt +++ b/x-plane-plugin/CMakeLists.txt @@ -7,18 +7,21 @@ if(LINUX OR APPLE) install(FILES ${opentrack-xplane-plugin-c} DESTINATION "${opentrack-doc-src-pfx}/opentrack-xplane-plugin") target_include_directories(opentrack-xplane-plugin SYSTEM PUBLIC ${SDK_XPLANE}/CHeaders ${SDK_XPLANE}/CHeaders/XPLM) - set(begin TARGET opentrack-xplane-plugin) - if(APPLE) - otr_prop(${begin} COMPILE_FLAGS "-iframework ${SDK_XPLANE}/Libraries/Mac/ -DAPL -DXPLM200 -DXPLM210 -framework XPLM -framework XPWidgets" - LINK_FLAGS "-F${SDK_XPLANE}/Libraries/Mac/ -framework XPLM -framework XPWidgets") + set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY + COMPILE_FLAGS "-iframework ${SDK_XPLANE}/Libraries/Mac/ -DAPL -DXPLM200 -DXPLM210 -framework XPLM -framework XPWidgets ") + set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY + LINK_FLAGS "-F${SDK_XPLANE}/Libraries/Mac/ -framework XPLM -framework XPWidgets ") elseif(CMAKE_COMPILER_IS_GNUCXX) - otr_prop(${begin} COMPILE_FLAGS "-fPIC -DLIN -DXPLM200 -DXPLM210" - LINK_FLAGS "-rdynamic -nodefaultlibs -fPIC") + set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY + COMPILE_FLAGS "-fPIC -DLIN -DXPLM200 -DXPLM210 ") + set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY + LINK_FLAGS "-rdynamic -nodefaultlibs -fPIC ") endif() if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_CLANG) - otr_prop(${begin} LINK_FLAGS "-undefined_warning") + set_property(TARGET opentrack-xplane-plugin APPEND_STRING PROPERTY + LINK_FLAGS "-undefined_warning ") endif() set_target_properties(opentrack-xplane-plugin PROPERTIES -- cgit v1.2.3