diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-06-14 23:40:37 +0000 |
|---|---|---|
| committer | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2017-06-15 08:50:53 +0000 |
| commit | c6627256555b3356238e57ffd749c413d28e8a3c (patch) | |
| tree | d17e74eae155ea535947d1cb1b06d446d0529d75 /CMakeScripts | |
| parent | Remove checks for unused functions. (diff) | |
| download | inkscape-c6627256555b3356238e57ffd749c413d28e8a3c.tar.gz inkscape-c6627256555b3356238e57ffd749c413d28e8a3c.zip | |
Remove duplicated build checks.
Most of these #defines are not even checked anyway, though they could
have the side-effect of failing configure before the build started.
However, these checks are redundant due to other checks for the same
thing:
* concept_check.hpp was added to Boost in 1.19.0, released in 2000. I
sincerely doubt anyone is using that version right now, but I added a
minimum version to the find_package() call. In any case, no code
actually checked the #define, so it wouldn't have built without it
anyway.
* FindBoehmGC puts gc.h on the compiler search path, so there's no need
to try gc/gc.h also.
* libintl.h is found by FindIntl.
* unordered_set is part of the C++11 standard.
* zlib.h is found by find_package(ZLIB).
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 7 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 8d35071f3..dd90eab65 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -13,18 +13,14 @@ include(CheckStructHasMember) set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS}) -CHECK_INCLUDE_FILE_CXX(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF) CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR) CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) -CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H) -CHECK_INCLUDE_FILES(gc.h HAVE_GC_H) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H) CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES) CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H) -CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H) CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) @@ -53,9 +49,6 @@ CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) -CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H) - -CHECK_INCLUDE_FILE_CXX(unordered_set HAVE_NATIVE_UNORDERED_SET) # Enable pango defines, necessary for compilation on Win32, how about Linux? # yes but needs to be done a better way diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 8cc0f0cd9..cfa5792aa 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -303,7 +303,7 @@ find_package(Freetype REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES}) -find_package(Boost REQUIRED) +find_package(Boost 1.19.0 REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS}) # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES}) |