From be43daf4828be414202b5d6964f1af39d7c8b95b Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Fri, 17 Jul 2015 13:48:53 +0200
Subject: [PATCH] Enabled CMAKE_INCLUDE_CURRENT_DIR.
See http://www.cmake.org/cmake/help/v3.0/variable/CMAKE_INCLUDE_CURRENT_DIR.html
---
Applications/DataExplorer/DataView/CMakeLists.txt | 2 --
Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt | 1 -
Applications/DataExplorer/DataView/StratView/CMakeLists.txt | 2 --
Applications/DataExplorer/VtkAct/CMakeLists.txt | 2 --
Applications/DataExplorer/VtkVis/CMakeLists.txt | 2 --
Applications/Utils/GeoTools/CMakeLists.txt | 1 -
Applications/Utils/MeshEdit/CMakeLists.txt | 1 -
Applications/Utils/SimpleMeshCreation/CMakeLists.txt | 1 -
ThirdParty/gtest/CMakeLists.txt | 2 +-
scripts/cmake/CMakeSetup.cmake | 2 ++
10 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/Applications/DataExplorer/DataView/CMakeLists.txt b/Applications/DataExplorer/DataView/CMakeLists.txt
index b2ca5195cf7..13cbea764ea 100644
--- a/Applications/DataExplorer/DataView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/CMakeLists.txt
@@ -135,7 +135,6 @@ set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/../Base
- ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/DiagramView
${CMAKE_CURRENT_BINARY_DIR}/StratView
${SOURCE_DIR_REL}/BaseLib
@@ -144,7 +143,6 @@ include_directories(
${SOURCE_DIR_REL}/MeshGeoToolsLib
${SOURCE_DIR_REL}/MeshLib
${SOURCE_DIR_REL}/FileIO
- ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/DiagramView
${CMAKE_CURRENT_SOURCE_DIR}/StratView
${GUI_SOURCE_DIR_REL}/Base
diff --git a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
index 96b539bb74b..a554c71675a 100644
--- a/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/DiagramView/CMakeLists.txt
@@ -44,7 +44,6 @@ include_directories(
${SOURCE_DIR_REL}/BaseLib
${SOURCE_DIR_REL}/GeoLib
${SOURCE_DIR_REL}/MathLib
- ${CMAKE_CURRENT_SOURCE_DIR}
${GUI_SOURCE_DIR_REL}/Base
${GUI_SOURCE_DIR_REL}/DataView
${CMAKE_CURRENT_BINARY_DIR}/../../DataView
diff --git a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
index 0c210c8c020..aff61e9cdce 100644
--- a/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
+++ b/Applications/DataExplorer/DataView/StratView/CMakeLists.txt
@@ -34,8 +34,6 @@ qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../..)
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
${SOURCE_DIR_REL}/BaseLib
${SOURCE_DIR_REL}/GeoLib
${SOURCE_DIR_REL}/MathLib
diff --git a/Applications/DataExplorer/VtkAct/CMakeLists.txt b/Applications/DataExplorer/VtkAct/CMakeLists.txt
index 913eceacf04..8a6a30005ef 100644
--- a/Applications/DataExplorer/VtkAct/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkAct/CMakeLists.txt
@@ -18,8 +18,6 @@ source_group("Moc Files" REGULAR_EXPRESSION "moc_.*")
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../../BaseLib
${CMAKE_CURRENT_SOURCE_DIR}/../../GeoLib
${CMAKE_CURRENT_SOURCE_DIR}/../../FileIO
diff --git a/Applications/DataExplorer/VtkVis/CMakeLists.txt b/Applications/DataExplorer/VtkVis/CMakeLists.txt
index d29b7b0bcf2..39879af65c0 100644
--- a/Applications/DataExplorer/VtkVis/CMakeLists.txt
+++ b/Applications/DataExplorer/VtkVis/CMakeLists.txt
@@ -124,7 +124,6 @@ qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
set(SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
set(GUI_SOURCE_DIR_REL ${CMAKE_CURRENT_SOURCE_DIR}/..)
include_directories(
- ${CMAKE_CURRENT_SOURCE_DIR}
${SOURCE_DIR_REL}/BaseLib
${SOURCE_DIR_REL}/GeoLib
${SOURCE_DIR_REL}/MathLib
@@ -134,7 +133,6 @@ include_directories(
${GUI_SOURCE_DIR_REL}/Base
${GUI_SOURCE_DIR_REL}/DataView
- ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../../BaseLib
${CMAKE_CURRENT_BINARY_DIR}/../DataView
)
diff --git a/Applications/Utils/GeoTools/CMakeLists.txt b/Applications/Utils/GeoTools/CMakeLists.txt
index 4eb8b7366c3..d7a9effb4ac 100644
--- a/Applications/Utils/GeoTools/CMakeLists.txt
+++ b/Applications/Utils/GeoTools/CMakeLists.txt
@@ -1,5 +1,4 @@
include_directories(
- ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/BaseLib
${CMAKE_SOURCE_DIR}/GeoLib
${CMAKE_SOURCE_DIR}/FileIO
diff --git a/Applications/Utils/MeshEdit/CMakeLists.txt b/Applications/Utils/MeshEdit/CMakeLists.txt
index 3ec91b0cfb5..9c3ef323574 100644
--- a/Applications/Utils/MeshEdit/CMakeLists.txt
+++ b/Applications/Utils/MeshEdit/CMakeLists.txt
@@ -1,6 +1,5 @@
include_directories(
- ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/BaseLib
${CMAKE_SOURCE_DIR}/GeoLib
${CMAKE_SOURCE_DIR}/FileIO
diff --git a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
index 5fb35a4cf01..8d67ddb55f4 100644
--- a/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
+++ b/Applications/Utils/SimpleMeshCreation/CMakeLists.txt
@@ -1,6 +1,5 @@
include_directories(
- ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/BaseLib
${CMAKE_SOURCE_DIR}/FileIO
${CMAKE_SOURCE_DIR}/FileIO/Legacy
diff --git a/ThirdParty/gtest/CMakeLists.txt b/ThirdParty/gtest/CMakeLists.txt
index e1e88d24158..b4edeff3698 100644
--- a/ThirdParty/gtest/CMakeLists.txt
+++ b/ThirdParty/gtest/CMakeLists.txt
@@ -10,7 +10,7 @@ else ()
add_definitions (-DGTEST_HAS_PTHREAD=0)
endif ()
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
add_library (GTest src/gtest-all.cc)
set_target_properties(GTest PROPERTIES FOLDER Testing)
diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake
index eec1f587ff4..158c797a262 100644
--- a/scripts/cmake/CMakeSetup.cmake
+++ b/scripts/cmake/CMakeSetup.cmake
@@ -71,3 +71,5 @@ if(APPLE)
endif()
endif()
mark_as_advanced(OSX_VERSION OSX_VERSION_NAME)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
--
GitLab