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

CMLibCommonLibraryTarget.cmake

@@ -4,15 +4,15 @@ function(add_common_library target)
   set(oneValueArgs OUTPUT_NAME)
   set(multiValueArgs SOURCES)
 
-  cmake_parse_arguments(_LOCAL "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+  cmake_parse_arguments(_PREFIX "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-  if(_LOCAL_OUTPUT_NAME)
+  if(_PREFIX_OUTPUT_NAME)
-    set(output_name ${_LOCAL_OUTPUT_NAME})
+    set(output_name ${_PREFIX_OUTPUT_NAME})
   else()
     set(output_name ${target})
   endif()
 
-  add_library(${target} OBJECT ${_LOCAL_SOURCES})
+  add_library(${target} OBJECT ${_PREFIX_SOURCES})
   target_include_directories(
     ${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
                      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include> $<INSTALL_INTERFACE:include/${target}>)

CMLibCotire.cmake

@@ -1,4 +1,4 @@
-include(cotire)
+include(cotire OPTIONAL)
 
 if(COMMAND cotire)
   option(CMLIB_COTIRE_ENABLE_PRECOMPILED_HEADER "Enable precompiled headers" OFF)

CMLibHighPrecisionMath.cmake

@@ -0,0 +1,11 @@
+find_package(Quadmath)
+if(QUADMATH_FOUND)
+  add_definitions(-DHAVE_QUADMATH=1)
+else()
+  find_package(MPFR)
+  if(MPFR_FOUND)
+    find_package(MPFRCppThirdparty)
+  else()
+    message(FATAL_ERROR "Nor Quadmath, nor MPFR found.")
+  endif()
+endif()

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()