From 6fe74d3fbadd9850231e536a7d6a6c8887a208da Mon Sep 17 00:00:00 2001 From: maier Date: Mon, 28 Oct 2013 13:07:50 +0000 Subject: [PATCH] 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 --- deal.II/cmake/setup_finalize.cmake | 3 ++- deal.II/contrib/mesh_conversion/CMakeLists.txt | 2 +- deal.II/contrib/parameter_gui/CMakeLists.txt | 2 +- deal.II/tests/mesh_converter/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake index 82a86052d3..8a084e5027 100644 --- 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 f17569af7d..387797f3e1 100644 --- 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 c06c0823dc..b0350b59e0 100644 --- 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 9d1e80e293..63df321378 100644 --- 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 -- 2.39.5