diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-09 18:11:04 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-05-09 18:11:04 +0000 |
| commit | 67810fe35e7654b9cf0706abc317a9b53dcbff72 (patch) | |
| tree | 80122a4933f581ee6f343895a9700368eb9a6107 | |
| parent | cmake: do not install static libraries on Windows (diff) | |
| download | inkscape-67810fe35e7654b9cf0706abc317a9b53dcbff72.tar.gz inkscape-67810fe35e7654b9cf0706abc317a9b53dcbff72.zip | |
cmake: Don't include 'ConfigPaths.cmake' twice
(bzr r15680)
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | CMakeScripts/ConfigEnv.cmake | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b2aab26c6..8b22c2869 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}") include(CMakeScripts/HelperFunctions.cmake) include(CMakeScripts/ConfigEnv.cmake) +include(CMakeScripts/ConfigPaths.cmake) # ----------------------------------------------------------------------------- # CMake Configuration @@ -95,8 +96,6 @@ option(WITH_YAML "Compile with YAML support (enables xverbs)" ON) option(ENABLE_BINRELOC "Enable relocatable binaries" OFF) -include(CMakeScripts/ConfigPaths.cmake) # Installation Paths - # ----------------------------------------------------------------------------- # Test Harness # ----------------------------------------------------------------------------- diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index dc4c70ba3..dd4e7e10c 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -52,5 +52,3 @@ if(APPLE) pkg_check_variable(gtk+-2.0 target)
message("GTK2 backend: ${GTK+_2.0_TARGET}")
endif()
-
-include(CMakeScripts/ConfigPaths.cmake)
\ No newline at end of file |