CMake: Make includes a bit more robust

git-svn-id: https://svn.dealii.org/trunk@29007 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/CMakeLists.txt b/deal.II/CMakeLists.txt
index 7d31c824bba3cd12e1f33922aee713be2b9ee6f6..b665897d70faaaadb86129e7303c8652a97fcd94 100644 (file)
--- a/deal.II/CMakeLists.txt
+++ b/deal.II/CMakeLists.txt
@@ -32,8 +32,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 MESSAGE(STATUS "This is CMake ${CMAKE_VERSION}")
 
-SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
-
 LIST(APPEND CMAKE_MODULE_PATH
   ${CMAKE_SOURCE_DIR}/cmake/
   ${CMAKE_SOURCE_DIR}/cmake/modules/

diff --git a/deal.II/source/base/CMakeLists.txt b/deal.II/source/base/CMakeLists.txt
index ad3da0be3f3d0e46e4226ce146094435106003ba..3958f050e86de0fd06cfe394e000974d749fce10 100644 (file)
--- a/deal.II/source/base/CMakeLists.txt
+++ b/deal.II/source/base/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src_base
   auto_derivative_function.cc
   conditional_ostream.cc

diff --git a/deal.II/source/distributed/CMakeLists.txt b/deal.II/source/distributed/CMakeLists.txt
index 6cb80561b3dcf7827d00598ca9e71cc047909cb2..7ecc116e12c372909720b5cafb7df1250656a335 100644 (file)
--- a/deal.II/source/distributed/CMakeLists.txt
+++ b/deal.II/source/distributed/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   grid_refinement.cc
   solution_transfer.cc

diff --git a/deal.II/source/dofs/CMakeLists.txt b/deal.II/source/dofs/CMakeLists.txt
index 348c43def2cec55a6996e0bc4505ed1b9b7bd05c..a730ecb9828d4f1886a58ca94e79a4b82ab5dfde 100644 (file)
--- a/deal.II/source/dofs/CMakeLists.txt
+++ b/deal.II/source/dofs/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   block_info.cc
   dof_accessor.cc

diff --git a/deal.II/source/fe/CMakeLists.txt b/deal.II/source/fe/CMakeLists.txt
index b58e89d25d406c2c6c7ae1272a46ade4eaf5461d..4d2ec0ff8fc0413337b11ce46de8c8fe4e6eaa8a 100644 (file)
--- a/deal.II/source/fe/CMakeLists.txt
+++ b/deal.II/source/fe/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   block_mask.cc
   component_mask.cc

diff --git a/deal.II/source/grid/CMakeLists.txt b/deal.II/source/grid/CMakeLists.txt
index 51e8bb9f2de35fc8f14399fe988b97f41aed00b0..91e5d3a889e433ec4420ad955a3e8e0cf4de73a0 100644 (file)
--- a/deal.II/source/grid/CMakeLists.txt
+++ b/deal.II/source/grid/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   grid_generator.cc
   grid_in.cc

diff --git a/deal.II/source/hp/CMakeLists.txt b/deal.II/source/hp/CMakeLists.txt
index 350bd14a7f61ae4a08c314c704a2a1f3042615f3..c16ccb2834df67e2355f9a3b9e9731f40971fc54 100644 (file)
--- a/deal.II/source/hp/CMakeLists.txt
+++ b/deal.II/source/hp/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   dof_faces.cc
   dof_handler.cc

diff --git a/deal.II/source/lac/CMakeLists.txt b/deal.II/source/lac/CMakeLists.txt
index 3c82807cd64a3f6a9822faba47a779da09fad4dc..4c872f34b169246148724231923bf6157604f29c 100644 (file)
--- a/deal.II/source/lac/CMakeLists.txt
+++ b/deal.II/source/lac/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   block_matrix_array.cc
   block_sparse_matrix.cc

diff --git a/deal.II/source/multigrid/CMakeLists.txt b/deal.II/source/multigrid/CMakeLists.txt
index e75b9af4625a63d66e42ed765d3b126f48d685f9..cbe2e7d6c2cb7492da5db3879a792938789dafdb 100644 (file)
--- a/deal.II/source/multigrid/CMakeLists.txt
+++ b/deal.II/source/multigrid/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   mg_base.cc
   mg_dof_handler.cc

diff --git a/deal.II/source/numerics/CMakeLists.txt b/deal.II/source/numerics/CMakeLists.txt
index a5cb3d74c6beacfecc7eb6b64368626a0da3bfad..08cb80e927628719b4e4c3c9a7283ce10eb698bd 100644 (file)
--- a/deal.II/source/numerics/CMakeLists.txt
+++ b/deal.II/source/numerics/CMakeLists.txt
@@ -12,6 +12,8 @@
 ##
 #####
 
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
+
 SET(src
   data_out.cc
   data_out_faces.cc