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

Compare commits

base: f1x1t:f500a10a0db04e26542f98cc0f39d8b01eb87d39
Branches Tags
f1x1t:master
..
compare: f1x1t:a2ae14a6e8c903734a819f0dc9a4ced952b01e04
Branches Tags
f1x1t:master

3 Commits
f500a10a0d ... a2ae14a6e8

Author SHA1 Message Date
Andrey Astafyev
a2ae14a6e8 В режиме отладки по умолчанию включены предкомпилированные заголовки 2021-07-22 15:39:51 +03:00
Andrey Astafyev
5708fcd5e4 Merge branch 'master' of git.246060.ru:f1x1t/cmlib 2021-07-22 14:20:22 +03:00
Andrey Astafyev
aa53289311 Правка cotire 2021-07-22 14:19:50 +03:00
2 changed files with 7 additions and 2 deletions
Show Stats Expand all files Collapse all files

8
CMLibCotire.cmake
View File

@ -1,6 +1,10 @@
include(cotire) include(cotire OPTIONAL)
if(COMMAND cotire) if(COMMAND cotire)
option(CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER "Enable precompiled headers" OFF) if(CMAKE_BUILD_TYPE STREQUAL "Debug")
option(CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER "Enable precompiled headers" ON)
else()
option(CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER "Enable precompiled headers" OFF)
endif()
option(CMLIB_COTIRE_ADD_UNITY_BUILD "Enable unity build" OFF) option(CMLIB_COTIRE_ADD_UNITY_BUILD "Enable unity build" OFF)
endif() endif()

1
thirdparty/cotire.cmake vendored
View File

@ -640,6 +640,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
endforeach() endforeach()
list (REMOVE_DUPLICATES _includeDirs) list (REMOVE_DUPLICATES _includeDirs)
list (REMOVE_DUPLICATES _systemIncludeDirs) list (REMOVE_DUPLICATES _systemIncludeDirs)
list (REMOVE_ITEM _systemIncludeDirs "/usr/include")
if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES) if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES}) list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
endif() endif()