Compare commits
No commits in common. "ec1d917195db831f7f42bdbb4446d95e2f98a165" and "c6414bbc03c924379ceb7c7d7c914f4853e5d528" have entirely different histories.
ec1d917195
...
c6414bbc03
@ -35,7 +35,8 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile)
|
|||||||
CACHE STRING "" FORCE)
|
CACHE STRING "" FORCE)
|
||||||
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
|
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
|
||||||
CACHE STRING "" FORCE)
|
CACHE STRING "" FORCE)
|
||||||
set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE}" CACHE STRING "" FORCE)
|
set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE}"
|
||||||
|
CACHE STRING "" FORCE)
|
||||||
set(CMAKE_MODULE_LINKER_FLAGS_PROFILE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
|
set(CMAKE_MODULE_LINKER_FLAGS_PROFILE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
|
||||||
CACHE STRING "" FORCE)
|
CACHE STRING "" FORCE)
|
||||||
elseif(CMAKE_CXX_COMPILER_IS_Intel)
|
elseif(CMAKE_CXX_COMPILER_IS_Intel)
|
||||||
|
@ -69,12 +69,9 @@ function(common_target_properties target)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# cmake-format: off
|
set_property(TARGET ${target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER
|
||||||
set_property(TARGET ${target}
|
${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER})
|
||||||
PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER})
|
set_property(TARGET ${target} PROPERTY COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD})
|
||||||
set_property(TARGET ${target}
|
|
||||||
PROPERTY COTIRE_ADD_UNITY_BUILD ${CMLIB_COTIRE_ADD_UNITY_BUILD})
|
|
||||||
# cmake-format: on
|
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL Profile)
|
if(CMAKE_BUILD_TYPE STREQUAL Profile)
|
||||||
target_compile_definitions(${target} ${__visibility} PROFILE)
|
target_compile_definitions(${target} ${__visibility} PROFILE)
|
||||||
@ -85,6 +82,9 @@ function(common_target_properties target)
|
|||||||
elseif(CMAKE_BUILD_TYPE STREQUAL None)
|
elseif(CMAKE_BUILD_TYPE STREQUAL None)
|
||||||
target_compile_definitions(${target} ${__visibility} ANALYSIS)
|
target_compile_definitions(${target} ${__visibility} ANALYSIS)
|
||||||
endif()
|
endif()
|
||||||
target_compile_definitions(${target} ${__visibility} "TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}")
|
target_compile_definitions(
|
||||||
target_compile_definitions(${target} ${__visibility} "TARGET_LSB_CODENAME_${LSB_CODENAME}")
|
${target}
|
||||||
|
${__visibility}
|
||||||
|
"TARGET_LSB_ID_${LSB_DISTRIBUTOR_ID}"
|
||||||
|
"TARGET_LSB_CODENAME_${LSB_CODENAME}")
|
||||||
endfunction()
|
endfunction()
|
||||||
|
@ -19,68 +19,33 @@ macro(CHECK_ENABLE_CXX_FLAG flag)
|
|||||||
unset(CHECK_CXX_FLAG CACHE)
|
unset(CHECK_CXX_FLAG CACHE)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
function(cmlib_set_cxx_standard version)
|
if(LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" AND LSB_CODENAME STREQUAL "smolensk" AND LSB_RELEASE STREQUAL
|
||||||
|
"1.5")
|
||||||
# Выбор стандарта по умолчанию (можно переопределить в проекте)
|
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED YES)
|
|
||||||
|
|
||||||
if(version STREQUAL "11")
|
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
|
||||||
set(CMAKE_CXX_EXTENSIONS YES)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(version STREQUAL "14")
|
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
|
||||||
set(CMAKE_CXX_EXTENSIONS YES)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(version STREQUAL "17")
|
|
||||||
if(${CMAKE_VERSION} VERSION_LESS "3.10.0")
|
|
||||||
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
|
|
||||||
if(HAVE_FLAG_STD_GNUXX17)
|
|
||||||
add_compile_options("-std=gnu++17")
|
|
||||||
else()
|
|
||||||
check_cxx_compiler_flag(-std=gnu++1z HAVE_FLAG_STD_GNUXX1Z)
|
|
||||||
if(HAVE_FLAG_STD_GNUXX1Z)
|
|
||||||
add_compile_options("-std=gnu++1z")
|
|
||||||
else()
|
|
||||||
check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17)
|
|
||||||
if(HAVE_FLAG_STD_CXX17)
|
|
||||||
add_compile_options("-std=c++17")
|
|
||||||
else()
|
|
||||||
check_cxx_compiler_flag(-std=c++1z HAVE_FLAG_STD_CXX1Z)
|
|
||||||
if(HAVE_FLAG_STD_CXX1Z)
|
|
||||||
add_compile_options("-std=c++1z")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
|
||||||
set(CMAKE_CXX_EXTENSIONS YES)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
# cmake-format: off
|
|
||||||
if(LSB_DISTRIBUTOR_ID STREQUAL "AstraLinuxSE" AND
|
|
||||||
LSB_CODENAME STREQUAL "smolensk" AND
|
|
||||||
LSB_RELEASE STREQUAL "1.5")
|
|
||||||
# cmake-format: on
|
|
||||||
cmlib_set_cxx_standard(11)
|
|
||||||
|
|
||||||
set(_CMAKE_TOOLCHAIN_PREFIX "x86_64-linux-gnu-")
|
set(_CMAKE_TOOLCHAIN_PREFIX "x86_64-linux-gnu-")
|
||||||
set(_CMAKE_TOOLCHAIN_SUFFIX "-4.7")
|
set(_CMAKE_TOOLCHAIN_SUFFIX "-4.7")
|
||||||
set(_CMAKE_TOOLCHAIN_LOCATION} "/usr/bin")
|
set(_CMAKE_TOOLCHAIN_LOCATION} "/usr/bin")
|
||||||
else()
|
else()
|
||||||
cmlib_set_cxx_standard(17)
|
|
||||||
|
|
||||||
# -Wshadow gives a lot of false positives with GCC 4.7.2 in Astra Linux 1.5
|
# -Wshadow gives a lot of false positives with GCC 4.7.2 in Astra Linux 1.5
|
||||||
if(CMAKE_CXX_COMPILER_IS_GCC)
|
if(CMAKE_CXX_COMPILER_IS_GCC)
|
||||||
check_enable_cxx_flag(-Wshadow)
|
check_enable_cxx_flag(-Wshadow)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Выбор стандарта по умолчанию (можно переопределить в проекте)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED YES)
|
||||||
|
|
||||||
|
check_cxx_compiler_flag(-std=c++14 HAVE_FLAG_STD_CXX14)
|
||||||
|
if(HAVE_FLAG_STD_CXX14)
|
||||||
|
set(CMAKE_CXX_STANDARD 14)
|
||||||
|
check_cxx_compiler_flag(-std=gnu++14 HAVE_FLAG_STD_GNUXX14)
|
||||||
|
if(HAVE_FLAG_STD_GNUXX14)
|
||||||
|
set(CMAKE_CXX_EXTENSIONS YES)
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
set(CMAKE_CXX_EXTENSIONS YES)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Common configuration for GCC, clang and Intel.
|
# Common configuration for GCC, clang and Intel.
|
||||||
if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_GCC)
|
if(CMAKE_CXX_COMPILER_IS_CLANG OR CMAKE_CXX_COMPILER_IS_INTEL OR CMAKE_CXX_COMPILER_IS_GCC)
|
||||||
if(CMLIB_WARNING_FLAGS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(CMLIB_WARNING_FLAGS AND CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
|
@ -43,3 +43,4 @@ endif()
|
|||||||
if(Qt5Core_DIR)
|
if(Qt5Core_DIR)
|
||||||
list(APPEND CMLIB_EXT_PROJ_DEFAULT_ARGS -DQt5Core_DIR=${Qt5Core_DIR})
|
list(APPEND CMLIB_EXT_PROJ_DEFAULT_ARGS -DQt5Core_DIR=${Qt5Core_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -6,9 +6,9 @@ endfunction()
|
|||||||
|
|
||||||
# Добавление общего префикса ко всем переменным в списке
|
# Добавление общего префикса ко всем переменным в списке
|
||||||
function(list_transform_prepend var prefix)
|
function(list_transform_prepend var prefix)
|
||||||
set(temp "")
|
set(temp "")
|
||||||
foreach(f ${${var}})
|
foreach(f ${${var}})
|
||||||
list(APPEND temp "${prefix}${f}")
|
list(APPEND temp "${prefix}${f}")
|
||||||
endforeach()
|
endforeach()
|
||||||
set(${var} "${temp}" PARENT_SCOPE)
|
set(${var} "${temp}" PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
@ -18,12 +18,12 @@ else()
|
|||||||
find_program(_lsb_release_executable lsb_release)
|
find_program(_lsb_release_executable lsb_release)
|
||||||
if(_lsb_release_executable)
|
if(_lsb_release_executable)
|
||||||
execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID
|
execute_process(COMMAND ${_lsb_release_executable} -si OUTPUT_VARIABLE LSB_DISTRIBUTOR_ID
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE LSB_CODENAME
|
execute_process(COMMAND ${_lsb_release_executable} -sc OUTPUT_VARIABLE LSB_CODENAME
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
|
|
||||||
execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE LSB_RELEASE
|
execute_process(COMMAND ${_lsb_release_executable} -sr OUTPUT_VARIABLE LSB_RELEASE
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
Reference in New Issue
Block a user