Bugfix: Commit the second half of the Executables.cmake --> Targets.cmake switch [1]

[1] And take an extra course in "how to use subversion"

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

diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake
index 82a86052d3bc5c9e9bc887b01c8f52da81d67252..8a084e5027e50af9ea7ae06164ecfd127e667c50 100644 (file)
--- a/deal.II/cmake/setup_finalize.cmake
+++ b/deal.II/cmake/setup_finalize.cmake
@@ -80,8 +80,9 @@ FILE(WRITE
 #
 # Cleanup deal.IITargets.cmake in the build directory:
 #
-FILE(REMOVE
+FILE(WRITE
   ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Targets.cmake
+  ""
   )
 
 

diff --git a/deal.II/contrib/mesh_conversion/CMakeLists.txt b/deal.II/contrib/mesh_conversion/CMakeLists.txt
index f17569af7d5ee1b64af3b489cbdd14b28951a2e7..387797f3e1183405d00c6cab980b810c2aac16fd 100644 (file)
--- a/deal.II/contrib/mesh_conversion/CMakeLists.txt
+++ b/deal.II/contrib/mesh_conversion/CMakeLists.txt
@@ -37,6 +37,6 @@ INSTALL(TARGETS mesh_converter_exe
   )
 EXPORT(TARGETS mesh_converter_exe
   FILE
-  ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Executables.cmake
+  ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Targets.cmake
   APPEND
   )

diff --git a/deal.II/contrib/parameter_gui/CMakeLists.txt b/deal.II/contrib/parameter_gui/CMakeLists.txt
index c06c0823dc19e7eeb858b966ca1882ce3020df18..b0350b59e01968edbc1fd943ba85b32572986ce1 100644 (file)
--- a/deal.II/contrib/parameter_gui/CMakeLists.txt
+++ b/deal.II/contrib/parameter_gui/CMakeLists.txt
@@ -60,7 +60,7 @@ INSTALL(TARGETS parameter_gui_exe
   COMPONENT parameter_gui
   )
 EXPORT(TARGETS parameter_gui_exe
-  FILE ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Executables.cmake
+  FILE ${CMAKE_BINARY_DIR}/${DEAL_II_PROJECT_CONFIG_RELDIR}/${DEAL_II_PROJECT_CONFIG_NAME}Targets.cmake
   APPEND
   )
 

diff --git a/deal.II/tests/mesh_converter/CMakeLists.txt b/deal.II/tests/mesh_converter/CMakeLists.txt
index 9d1e80e293be1fe631ce37ea54973188ce7fdb2e..63df32137896e78522779dc912bd827657ed7814 100644 (file)
--- a/deal.II/tests/mesh_converter/CMakeLists.txt
+++ b/deal.II/tests/mesh_converter/CMakeLists.txt
@@ -17,7 +17,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 INCLUDE(${DEAL_II_SOURCE_DIR}/cmake/setup_testsuite.cmake)
 PROJECT(testsuite CXX)
-INCLUDE(${DEAL_II_EXECUTABLE_CONFIG})
+INCLUDE(${DEAL_II_TARGET_CONFIG})
 
 #
 # Tests for the mesh_converter executable