From 0ab4aab3ada2527d545101405cc223ca21cc473e Mon Sep 17 00:00:00 2001 From: beaglejoe Date: Wed, 19 Oct 2022 18:21:14 +0000 Subject: [PATCH] Fix for building with CMake less than 3.13 git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@8606 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: ee517338133f9e06b79ab7e09c46135f3b12a664 Former-commit-id: 02f50fd73be0d06b3c12ab668512c229de59dba7 --- src/libs/tgfclient/CMakeLists.txt | 15 ++++++++------- src/main/CMakeLists.txt | 16 ++++++++-------- src/tools/menuview/CMakeLists.txt | 14 ++++++++------ src/tools/trackgen/CMakeLists.txt | 14 ++++++++------ 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/src/libs/tgfclient/CMakeLists.txt b/src/libs/tgfclient/CMakeLists.txt index 5ed13fbfb..2fe3c6f2f 100644 --- a/src/libs/tgfclient/CMakeLists.txt +++ b/src/libs/tgfclient/CMakeLists.txt @@ -95,10 +95,11 @@ ENDIF(UNIX) SD_INSTALL_FILES(INCLUDE FILES glfeatures.h guiscreen.h tgfclient.h) -# To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' -IF(UNIX AND NOT APPLE) - IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_link_options(tgfclient PRIVATE -Wl,--allow-shlib-undefined) - ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -ENDIF(UNIX AND NOT APPLE) - +IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") + # To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' + IF(UNIX AND NOT APPLE) + IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_link_options(tgfclient PRIVATE -Wl,--allow-shlib-undefined) + ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ENDIF(UNIX AND NOT APPLE) +ENDIF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index 8079e82ee..354be9c30 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -55,12 +55,12 @@ IF(WIN32) SD_INSTALL_CUSTOM_3RDPARTY(${_TARGET_NAME}) ENDIF(WIN32) +IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") # To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' -IF(UNIX AND NOT APPLE) - IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_link_options(${_TARGET_NAME} PRIVATE -Wl,--allow-shlib-undefined) - ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_link_options(${_TARGET_NAME} PRIVATE -Wl,-E) -ENDIF(UNIX AND NOT APPLE) - - + IF(UNIX AND NOT APPLE) + IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_link_options(${_TARGET_NAME} PRIVATE -Wl,--allow-shlib-undefined) + ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_link_options(${_TARGET_NAME} PRIVATE -Wl,-E) + ENDIF(UNIX AND NOT APPLE) +ENDIF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") diff --git a/src/tools/menuview/CMakeLists.txt b/src/tools/menuview/CMakeLists.txt index d9d839770..33cf8ad79 100644 --- a/src/tools/menuview/CMakeLists.txt +++ b/src/tools/menuview/CMakeLists.txt @@ -52,9 +52,11 @@ ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) -# To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' -IF(UNIX AND NOT APPLE) - IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_link_options(${_TARGET_NAME} PRIVATE -Wl,--allow-shlib-undefined) - ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -ENDIF(UNIX AND NOT APPLE) \ No newline at end of file +IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") + # To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' + IF(UNIX AND NOT APPLE) + IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_link_options(${_TARGET_NAME} PRIVATE -Wl,--allow-shlib-undefined) + ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ENDIF(UNIX AND NOT APPLE) +ENDIF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") diff --git a/src/tools/trackgen/CMakeLists.txt b/src/tools/trackgen/CMakeLists.txt index 3681324b9..c8317d722 100644 --- a/src/tools/trackgen/CMakeLists.txt +++ b/src/tools/trackgen/CMakeLists.txt @@ -56,9 +56,11 @@ ENDIF(UNIX) SD_INSTALL_FILES(BIN TARGETS ${_TARGET_NAME}) -# To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' -IF(UNIX AND NOT APPLE) - IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - target_link_options(${_TARGET_NAME} PRIVATE -Wl,--allow-shlib-undefined) - ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -ENDIF(UNIX AND NOT APPLE) +IF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13") + # To avoid 'undefined reference to glActiveTextureARB [--no-allow-shlib-undefined]' + IF(UNIX AND NOT APPLE) + IF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + target_link_options(${_TARGET_NAME} PRIVATE -Wl,--allow-shlib-undefined) + ENDIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + ENDIF(UNIX AND NOT APPLE) +ENDIF(NOT ${CMAKE_VERSION} VERSION_LESS "3.13")