From: maier Date: Sun, 24 Mar 2013 01:22:32 +0000 (+0000) Subject: CMake: Make includes a bit more robust X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bd48edb7d81162145db3349a2bd2bd59c7da42d;p=dealii-svn.git 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 7d31c824bb..b665897d70 100644 --- 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 ad3da0be3f..3958f050e8 100644 --- 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 6cb80561b3..7ecc116e12 100644 --- 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 348c43def2..a730ecb982 100644 --- 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 b58e89d25d..4d2ec0ff8f 100644 --- 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 51e8bb9f2d..91e5d3a889 100644 --- 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 350bd14a7f..c16ccb2834 100644 --- 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 3c82807cd6..4c872f34b1 100644 --- 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 e75b9af462..cbe2e7d6c2 100644 --- 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 a5cb3d74c6..08cb80e927 100644 --- 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