diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-01 20:59:56 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-10-01 22:50:13 +0000 |
| commit | 8a63ecf127e7ee87716367ae7b2e19267e19d09f (patch) | |
| tree | 31f496bb0937298df5b9c24a26c35dbabe3391a6 /CMakeScripts | |
| parent | Move macros.h and remove unneeded macros (diff) | |
| download | inkscape-8a63ecf127e7ee87716367ae7b2e19267e19d09f.tar.gz inkscape-8a63ecf127e7ee87716367ae7b2e19267e19d09f.zip | |
Avoid duplicating defines in config.h and on command line
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 5 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 123263ff4..c475970c9 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -31,11 +31,6 @@ if(HAVE_CAIRO_PDF) set(PANGO_ENABLE_ENGINE TRUE) endif() -# Relocatable Binary -if (ENABLE_BINRELOC) - add_definitions(-DENABLE_BINRELOC) -endif() - # Create the configuration files config.h in the binary root dir configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) add_definitions(-DHAVE_CONFIG_H) diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index a6b59e26a..aa637ead1 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -218,9 +218,9 @@ else() endif() if(WITH_LPETOOL) - add_definitions(-DWITH_LPETOOL -DLPE_ENABLE_TEST_EFFECTS) + set(LPE_ENABLE_TEST_EFFECTS ON) else() - add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS) + set(LPE_ENABLE_TEST_EFFECTS OFF) endif() # ---------------------------------------------------------------------------- @@ -245,7 +245,6 @@ list(APPEND INKSCAPE_LIBS ${GTK3_LIBRARIES}) pkg_check_modules(GDL_3_6 gdl-3.0>=3.6) if("${GDL_3_6_FOUND}") message(STATUS "Using GDL 3.6 or higher") - add_definitions(-DWITH_GDL_3_6) set (WITH_GDL_3_6 ON) endif() @@ -351,7 +350,6 @@ if(WITH_YAML) set (WITH_YAML ON) list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES}) - add_definitions(-DWITH_YAML) else(YAML_FOUND) set(WITH_YAML OFF) message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled") |