CMake file cleanup
This commit is contained in:
parent
39fa791384
commit
4e79d68807
|
@ -1,11 +1,11 @@
|
|||
if(APPLE)
|
||||
cmake_minimum_required(VERSION 3.3)
|
||||
CMAKE_POLICY(SET CMP0025 NEW)
|
||||
cmake_policy(SET CMP0025 NEW)
|
||||
else()
|
||||
cmake_minimum_required(VERSION 2.8.8)
|
||||
endif()
|
||||
|
||||
# Must stay before the PROJECT() command:
|
||||
# Must stay before the project() command:
|
||||
if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
|
||||
set(CMAKE_CXX_COMPILER_ARG1 "-std=c++11" CACHE STRING "C++ version for eclipse" FORCE)
|
||||
# Users building with Eclipse should set CMAKE_ECLIPSE_VERSION through the
|
||||
|
@ -13,7 +13,7 @@ if(${CMAKE_EXTRA_GENERATOR} MATCHES "Eclipse CDT4")
|
|||
#set(CMAKE_ECLIPSE_VERSION "4.6.0" CACHE STRING "Eclipse version" FORCE)
|
||||
endif()
|
||||
|
||||
PROJECT(RawTherapee)
|
||||
project(RawTherapee)
|
||||
|
||||
# The default target is Debug:
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "")
|
||||
|
@ -23,8 +23,8 @@ endif()
|
|||
string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_CMAKE_BUILD_TYPE)
|
||||
|
||||
# Set required C and C++ standards and check GCC version:
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
||||
|
||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
|
||||
message(FATAL_ERROR "Building RawTherapee requires using GCC version 4.9 or higher!")
|
||||
|
@ -342,35 +342,35 @@ endif()
|
|||
|
||||
if(WITH_LTO)
|
||||
# Using LTO with older versions of binutils requires setting extra flags
|
||||
SET(BINUTILS_VERSION_MININUM "2.29")
|
||||
set(BINUTILS_VERSION_MININUM "2.29")
|
||||
execute_process(COMMAND ar --version OUTPUT_VARIABLE BINUTILS_VERSION_DETECTED)
|
||||
string(REGEX REPLACE ".* ([0-9.]+)\n.*" "\\1" BINUTILS_VERSION_DETECTED "${BINUTILS_VERSION_DETECTED}")
|
||||
if("${BINUTILS_VERSION_DETECTED}" VERSION_LESS "${BINUTILS_VERSION_MININUM}")
|
||||
if(APPLE)
|
||||
SET(CMAKE_AR "/opt/local/bin/ar")
|
||||
SET(CMAKE_RANLIB "/opt/local/bin/ranlib")
|
||||
set(CMAKE_AR "/opt/local/bin/ar")
|
||||
set(CMAKE_RANLIB "/opt/local/bin/ranlib")
|
||||
else()
|
||||
SET(CMAKE_AR "/usr/bin/gcc-ar")
|
||||
SET(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
|
||||
set(CMAKE_AR "/usr/bin/gcc-ar")
|
||||
set(CMAKE_RANLIB "/usr/bin/gcc-ranlib")
|
||||
endif()
|
||||
message(STATUS "Binutils version detected as less than " ${BINUTILS_VERSION_MININUM} " - setting CMake parameters to enable LTO linking:\n CMAKE_AR=\"" ${CMAKE_AR} "\"\n CMAKE_RANLIB=\"" ${CMAKE_RANLIB} "\"")
|
||||
endif()
|
||||
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flto")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flto")
|
||||
endif()
|
||||
|
||||
if(WITH_SAN)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=${WITH_SAN}")
|
||||
endif()
|
||||
|
||||
if(WITH_PROF)
|
||||
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
|
||||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
|
||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pg")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg")
|
||||
endif()
|
||||
|
||||
if(OPTION_OMP)
|
||||
|
|
Loading…
Reference in New Issue