From 67810fe35e7654b9cf0706abc317a9b53dcbff72 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Tue, 9 May 2017 20:11:04 +0200 Subject: cmake: Don't include 'ConfigPaths.cmake' twice (bzr r15680) --- CMakeLists.txt | 3 +-- CMakeScripts/ConfigEnv.cmake | 2 -- 2 files changed, 1 insertion(+), 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 -- cgit v1.2.3