From 18e658887fa8593834c5834fb9339ece7b0a790d Mon Sep 17 00:00:00 2001 From: Gerardo Tauriello <gerardo.tauriello@unibas.ch> Date: Mon, 12 Aug 2019 13:42:51 +0200 Subject: [PATCH] SCHWED-4354: Fix compile version check --- CMakeLists.txt | 10 ---------- cmake_support/OST.cmake | 12 ++++++++---- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 37958562a..7b76c4eea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,16 +12,6 @@ set (OST_VERSION_STRING ${OST_VERSION_MAJOR}.${OST_VERSION_MINOR}.${OST_VERSION_ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake_support) include(OST) - -if (CMAKE_COMPILER_IS_GNUCXX) - exec_program(gcc ARGS --version OUTPUT_VARIABLE CMAKE_C_COMPILER_VERSION) - if(CMAKE_C_COMPILER_VERSION MATCHES ".*4\\.[5-9].*") - set(OST_GCC_45 true) - else() - set(OST_GCC_45 false) - endif() -endif() - option(USE_SHADER "whether to compile with shader support" OFF) option(USE_RPATH "embed rpath upon make install" diff --git a/cmake_support/OST.cmake b/cmake_support/OST.cmake index 4ee0d9440..9f7199a1e 100644 --- a/cmake_support/OST.cmake +++ b/cmake_support/OST.cmake @@ -321,14 +321,14 @@ macro(executable) if (ENABLE_STATIC AND _ARG_STATIC) target_link_libraries(${_ARG_NAME} ${STATIC_LIBRARIES}) if (UNIX AND NOT APPLE) - if (OST_GCC_45) + if (OST_GCC_LESS_45) set_target_properties(${_ARG_NAME} PROPERTIES LINK_SEARCH_END_STATIC TRUE - LINK_FLAGS "-static-libgcc -static-libstdc++ -static -pthread") + LINK_FLAGS "-static-libgcc -static -pthread") else() set_target_properties(${_ARG_NAME} PROPERTIES LINK_SEARCH_END_STATIC TRUE - LINK_FLAGS "-static-libgcc -static -pthread") + LINK_FLAGS "-static-libgcc -static-libstdc++ -static -pthread") endif() endif() endif() @@ -899,9 +899,13 @@ macro(setup_compiler_flags) #message(STATUS "GCC VERSION " ${_GCC_VERSION}) if ((ENABLE_INFO OR ENABLE_GUI) AND _GCC_VERSION LESS "60") # for older compilers we need to enable C++11 for Qt5 - #message(STATUS "ADDING C++11 FLAG") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif() + if (_GCC_VERSION LESS "45") + set(OST_GCC_LESS_45 true) + else() + set(OST_GCC_LESS_45 false) + endif() endif() endmacro() set(_BOOST_MIN_VERSION 1.31) -- GitLab