[cig-commits] commit 1853 by bangerth to /var/svn/dealii/aspect

[dealii.demon at gmail.com]

Revision 1853

Make cmake actually run with the build directory. Be more verbose on what we do.

U   trunk/aspect/CMakeLists.txt
U   trunk/aspect/tests/CMakeLists.txt


http://www.dealii.org/websvn/revision.php?repname=Aspect+Repository&path=%2F&rev=1853&peg=1853

Diff:
Modified: trunk/aspect/CMakeLists.txt
===================================================================
--- trunk/aspect/CMakeLists.txt	2013-08-23 18:16:11 UTC (rev 1852)
+++ trunk/aspect/CMakeLists.txt	2013-08-26 01:54:07 UTC (rev 1853)
@@ -2,14 +2,16 @@
 #  CMake script
 ##
 
+MESSAGE("====================================================")
+MESSAGE("============ Configuring ASPECT ====================")
+MESSAGE("====================================================")
+
 # Set the name of the project and target:
 SET(TARGET "aspect")
 
 FILE(GLOB_RECURSE TARGET_SRC  "source/*.cc")
 INCLUDE_DIRECTORIES(include)
 
-# Usually, you will not need to modify anything beyond this point...
-
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 
 FIND_PACKAGE(deal.II 8.0 QUIET
@@ -31,4 +33,14 @@
 
 DEAL_II_INITIALIZE_CACHED_VARIABLES()
 PROJECT(${TARGET})
+
+
+IF(EXISTS ${CMAKE_SOURCE_DIR}/tests/CMakeLists.txt)
+  ENABLE_TESTING()
+  ADD_SUBDIRECTORY(tests)
+ENDIF()
+
+
+MESSAGE("====================================================")
+
 DEAL_II_INVOKE_AUTOPILOT()

Modified: trunk/aspect/tests/CMakeLists.txt
===================================================================
--- trunk/aspect/tests/CMakeLists.txt	2013-08-23 18:16:11 UTC (rev 1852)
+++ trunk/aspect/tests/CMakeLists.txt	2013-08-26 01:54:07 UTC (rev 1853)
@@ -17,7 +17,8 @@
 
 FILE(GLOB _tests *.prm)
 FOREACH(_test ${_tests})
-  GET_FILENAME_COMPONENT(_test ${_test} NAME_WE) 
+  GET_FILENAME_COMPONENT(_test ${_test} NAME) 
+  MESSAGE(STATUS "Adding test ${_test}")
 
   IF(EXISTS ${_test}.cc)
     ADD_LIBRARY(${_test} SHARED EXCLUDE_FROM_ALL ${_test}.cc)
@@ -51,7 +52,7 @@
   # - diff this file with the saved one and save the result
   FILE(GLOB _outputs ${CMAKE_CURRENT_SOURCE_DIR}/${_test}/*)
   FOREACH(_output ${_outputs})
-    GET_FILENAME_COMPONENT(_output ${_output} NAME_WE) 
+    GET_FILENAME_COMPONENT(_output ${_output} NAME) 
 
     # create the output.notime target
     ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/output-${_test}/${_output}.notime