Merge branch 'master' of git.246060.ru:f1x1t/cmlib

Правка cotire
2021-07-22 14:20:22 +03:00 · 2021-07-22 14:19:50 +03:00
2 changed files with 2 additions and 1 deletions
--- a/CMLibCotire.cmake
+++ b/CMLibCotire.cmake
@@ -1,4 +1,4 @@
-include(cotire)
+include(cotire OPTIONAL)

 if(COMMAND cotire)
  option(CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER "Enable precompiled headers" OFF)
--- a/thirdparty/cotire.cmake
+++ b/thirdparty/cotire.cmake
@@ -640,6 +640,7 @@ function (cotire_get_target_include_directories _config _language _target _inclu
 	endforeach()
 	list (REMOVE_DUPLICATES _includeDirs)
 	list (REMOVE_DUPLICATES _systemIncludeDirs)
+	list (REMOVE_ITEM _systemIncludeDirs "/usr/include")
 	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
 		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
 	endif()
Author	SHA1	Message	Date
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