diff options
| author | Patrick Storz <eduard.braun2@gmx.de> | 2019-04-01 20:27:29 +0000 |
|---|---|---|
| committer | Patrick Storz <eduard.braun2@gmx.de> | 2019-04-02 20:10:02 +0000 |
| commit | 8bee1bfab5036f0f2f13df1853ea7e0e0085f3da (patch) | |
| tree | 2bd98d7ea244248615460493ad6ce502fa78f431 | |
| parent | 2geom: update to 7e3b3f75023c7c69fd085574cfaa46de0213bbbc (diff) | |
| download | inkscape-8bee1bfab5036f0f2f13df1853ea7e0e0085f3da.tar.gz inkscape-8bee1bfab5036f0f2f13df1853ea7e0e0085f3da.zip | |
Add new lib2geom dependency: "double-conversion"
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/Modules/FindDoubleConversion.cmake | 25 | ||||
| -rw-r--r-- | src/2geom/CMakeLists.txt | 2 |
3 files changed, 29 insertions, 0 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 8099f0997..397ca9468 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -68,6 +68,8 @@ list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS}) add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER}) +find_package(DoubleConversion REQUIRED) # lib2geom dependency + if(WITH_JEMALLOC) find_package(JeMalloc) if (JEMALLOC_FOUND) diff --git a/CMakeScripts/Modules/FindDoubleConversion.cmake b/CMakeScripts/Modules/FindDoubleConversion.cmake new file mode 100644 index 000000000..fee62ced1 --- /dev/null +++ b/CMakeScripts/Modules/FindDoubleConversion.cmake @@ -0,0 +1,25 @@ +# - Try to find double-conversion +# Once done, this will define +# +# DOUBLE_CONVERSION_FOUND - system has double-conversion +# DOUBLE_CONVERSION_INCLUDE_DIRS - the double-conversion include directories +# DOUBLE_CONVERSION_LIBRARIES - link these to use double-conversion + +include(FindPackageHandleStandardArgs) + +find_library(DOUBLE_CONVERSION_LIBRARY double-conversion + PATHS ${DOUBLE_CONVERSION_LIBRARYDIR}) + +find_path(DOUBLE_CONVERSION_INCLUDE_DIR double-conversion/double-conversion.h + PATHS ${DOUBLE_CONVERSION_INCLUDEDIR}) + +find_package_handle_standard_args(double_conversion DEFAULT_MSG + DOUBLE_CONVERSION_LIBRARY + DOUBLE_CONVERSION_INCLUDE_DIR) + +mark_as_advanced( + DOUBLE_CONVERSION_LIBRARY + DOUBLE_CONVERSION_INCLUDE_DIR) + +set(DOUBLE_CONVERSION_LIBRARIES ${DOUBLE_CONVERSION_LIBRARY}) +set(DOUBLE_CONVERSION_INCLUDE_DIRS ${DOUBLE_CONVERSION_INCLUDE_DIR}) diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt index 244f3ff62..988fd1b54 100644 --- a/src/2geom/CMakeLists.txt +++ b/src/2geom/CMakeLists.txt @@ -131,3 +131,5 @@ set(2geom_SRC # make lib for 2geom_LIB add_inkscape_lib(2geom_LIB "${2geom_SRC}") +target_include_directories(2geom_LIB PRIVATE ${DOUBLE_CONVERSION_INCLUDE_DIRS}) +target_link_libraries(2geom_LIB PRIVATE ${DOUBLE_CONVERSION_LIBRARIES}) |