diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 10:09:58 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-30 10:09:58 +0100 |
| commit | 36273c6dfdd9a0a22e396b354213eb492886afaf (patch) | |
| tree | 23152837b6f861d9e0ca667141e8b34cf90398a6 /cmake | |
| parent | 3bdd6411060dce095528239acc1812d4e7180371 (diff) | |
| parent | 48c30a3d75d18e87e39c18cb52961bb37ab6055e (diff) | |
Merge branch 'unstable' into trackhat
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/opentrack-macros.cmake b/cmake/opentrack-macros.cmake index a9fa5bc7..df19ddf0 100644 --- a/cmake/opentrack-macros.cmake +++ b/cmake/opentrack-macros.cmake @@ -32,7 +32,7 @@ endfunction() macro(opentrack_library n dir) cmake_parse_arguments(opentrack-foolib - "NO-LIBRARY;STATIC;NO-COMPAT" + "NO-LIBRARY;STATIC;NO-COMPAT;NO-LINKER-SCRIPT" "LINK;COMPILE;GNU-LINK;GNU-COMPILE" "" ${ARGN} @@ -52,7 +52,7 @@ macro(opentrack_library n dir) if(NOT opentrack-foolib_NO-COMPAT) target_link_libraries(${n} opentrack-api ${MY_QT_LIBS} opentrack-compat) endif() - if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE) + if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND NOT NO-LINKER-SCRIPT) SET_TARGET_PROPERTIES(${n} PROPERTIES LINK_FLAGS "${opentrack-foolib_LINK} ${opentrack-foolib_GNU-LINK} -Wl,--as-needed -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack-compat/${version-script}-version-script.txt\"" COMPILE_FLAGS "${opentrack-foolib_COMPILE} ${opentrack-foolib_GNU-COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden" |