From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 3 Sep 2014 22:07:11 +0000 (+0200)
Subject: Testsuite: Fix globbing command for all-headers tests, cleanup code
X-Git-Tag: v8.2.0-rc1~161^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F133%2Fhead;p=dealii.git

Testsuite: Fix globbing command for all-headers tests, cleanup code

Turns out that globbing together a full path and manually extracting
relative paths is not the best idea. Clean up this mess by using
FILE(GLOB_RECURSE [base path] [...]) that produces nice relative paths.
---

diff --git a/tests/all-headers/CMakeLists.txt b/tests/all-headers/CMakeLists.txt
index fd8c9995ba..28e16c8421 100644
--- a/tests/all-headers/CMakeLists.txt
+++ b/tests/all-headers/CMakeLists.txt
@@ -1,7 +1,7 @@
 ## ---------------------------------------------------------------------
 ## $Id$
 ##
-## Copyright (C) 2013 by the deal.II authors
+## Copyright (C) 2013 - 2014 by the deal.II authors
 ##
 ## This file is part of the deal.II library.
 ##
@@ -29,23 +29,20 @@ INCLUDE(${DEAL_II_TARGET_CONFIG})
 
 SET(_category all-headers)
 
-FILE(GLOB_RECURSE _header ${DEAL_II_SOURCE_DIR}/include/deal.II/*.h)
-
-FOREACH(_full_file ${_header})
-  GET_FILENAME_COMPONENT(_file ${_full_file} NAME)
-
-  # TODO: A more sophisticated way to get the relative include path:
-  GET_FILENAME_COMPONENT(_path ${_full_file} PATH)
-  GET_FILENAME_COMPONENT(_path ${_path} NAME)
-  IF("${_path}" STREQUAL "std_cxx11")
-    SET(_path "base/std_cxx11")
-  ENDIF()
+#
+# Glob together all header files and strip SOURCE_DIR/include/deal.II to
+# get a correct relative path:
+#
+FILE(GLOB_RECURSE _headers ${DEAL_II_SOURCE_DIR}/include/deal.II/
+  ${DEAL_II_SOURCE_DIR}/include/deal.II/*.h
+  )
 
+FOREACH(_header ${_headers})
   FOREACH(_build ${DEAL_II_BUILD_TYPES})
     STRING(TOLOWER ${_build} _build_lowercase)
 
-    SET(_test ${_category}/${_path}/${_file}.${_build_lowercase})
-    STRING(REGEX REPLACE "\\/" "-" _target ${_path}/${_file}.${_build_lowercase})
+    SET(_test ${_category}/${_header}.${_build_lowercase})
+    STRING(REGEX REPLACE "\\/" "-" _target ${_header}.${_build_lowercase})
 
     # Respect TEST_PICKUP_REGEX:
     IF( "${TEST_PICKUP_REGEX}" STREQUAL "" OR
@@ -76,7 +73,7 @@ FOREACH(_full_file ${_header})
         INCLUDE_DIRECTORIES "${DEAL_II_INCLUDE_DIRS}"
         )
       SET_PROPERTY(TARGET ${_target} APPEND PROPERTY
-        COMPILE_DEFINITIONS HEADER=<deal.II/${_path}/${_file}>
+        COMPILE_DEFINITIONS HEADER=<deal.II/${_header}>
         )
 
       ADD_CUSTOM_TARGET(${_target}.build