diff options
| author | kocsv <kocsv@local> | 2017-05-16 10:18:46 +0200 |
|---|---|---|
| committer | kocsv <kocsv@local> | 2017-05-16 10:18:46 +0200 |
| commit | 82e4dc80f5838efcb08ac1c89f58a324b2a26409 (patch) | |
| tree | f1f28bf0e1ad1fdcee4b2f87f34d9aa169080a5a /x-plane-plugin | |
| parent | aacc3bb2b563cd172e340365b8f14ec8fae32d9d (diff) | |
| parent | a9ddb1242181032c549bcac7341e38cb2ee0bb73 (diff) | |
Merge https://github.com/opentrack/opentrack into unstable
merge from upstream
Diffstat (limited to 'x-plane-plugin')
| -rw-r--r-- | x-plane-plugin/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/x-plane-plugin/CMakeLists.txt b/x-plane-plugin/CMakeLists.txt index abca2d68..db712590 100644 --- a/x-plane-plugin/CMakeLists.txt +++ b/x-plane-plugin/CMakeLists.txt @@ -7,18 +7,18 @@ 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 APPEND_STRING PROPERTY) + set(begin TARGET opentrack-xplane-plugin) if(APPLE) - set_property(${begin} COMPILE_FLAGS "-iframework ${SDK_XPLANE}/Libraries/Mac/ -DAPL -DXPLM200 -DXPLM210 -framework XPLM -framework XPWidgets") - set_property(${begin} LINK_FLAGS "-F${SDK_XPLANE}/Libraries/Mac/ -framework XPLM -framework XPWidgets") + 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") elseif(CMAKE_COMPILER_IS_GNUCXX) - set_property(${begin} COMPILE_FLAGS "-fPIC -DLIN -DXPLM200 -DXPLM210") - set_property(${begin} LINK_FLAGS "-rdynamic -nodefaultlibs -fPIC") + otr_prop(${begin} COMPILE_FLAGS "-fPIC -DLIN -DXPLM200 -DXPLM210" + LINK_FLAGS "-rdynamic -nodefaultlibs -fPIC") endif() if(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_COMPILER_IS_CLANG) - set_property(${begin} LINK_FLAGS "-undefined_warning") + otr_prop(${begin} LINK_FLAGS "-undefined_warning") endif() set_target_properties(opentrack-xplane-plugin PROPERTIES |