f1x1t/cmlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: f1x1t:f5151f5a2b102b75486c72df8d0dddd842ed0bbc
Branches Tags
f1x1t:master
...
compare: f1x1t:a0cc72077c11defd55d44228e48f9e560577323d
Branches Tags
f1x1t:master

3 Commits
f5151f5a2b ... a0cc72077c

Author SHA1 Message Date
Andrey Astafyev
a0cc72077c Проверка доступности стандарта C++17 2020-12-21 16:05:42 +03:00
Andrey Astafyev
81bed8b385 Merge branch 'master' of git.246060.ru:f1x1t/cmlib 2020-12-10 12:24:32 +03:00
Andrey Astafyev
6020cb02c0 Исправлена сборка статической библиотеки в режиме профилировки 2020-12-10 12:23:47 +03:00
2 changed files with 17 additions and 8 deletions
Expand all files Collapse all files

2
CMLibBuildTypes.cmake
View File

@@ -35,7 +35,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Profile)
CACHE STRING "" FORCE)
set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
CACHE STRING "" FORCE)
set(CMAKE_STATIC_LINKER_FLAGS_PROFILE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} ${_gcc_profile_flags}"
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}"
CACHE STRING "" FORCE)

23
CMLibCompilerFlags.cmake
View File

@@ -34,16 +34,25 @@ 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)
check_cxx_compiler_flag(-std=c++17 HAVE_FLAG_STD_CXX17)
if(HAVE_FLAG_STD_CXX17)
set(CMAKE_CXX_STANDARD 17)
check_cxx_compiler_flag(-std=gnu++17 HAVE_FLAG_STD_GNUXX17)
if(HAVE_FLAG_STD_GNUXX17)
set(CMAKE_CXX_EXTENSIONS YES)
endif()
else()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS 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()
endif()
# Common configuration for GCC, clang and Intel.