Reorganize build system target exports

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30554 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/cmake/macros/macro_expand_instantiations.cmake b/deal.II/cmake/macros/macro_expand_instantiations.cmake
index 5516eb01de9e9ccbd23b1913dbd1d1015062e59b..dffa1b5848ed96dd44681fd9f3e71711380770dd 100644 (file)
--- a/deal.II/cmake/macros/macro_expand_instantiations.cmake
+++ b/deal.II/cmake/macros/macro_expand_instantiations.cmake
@@ -36,7 +36,7 @@
 MACRO(EXPAND_INSTANTIATIONS _target _inst_in_files)
 
   IF(CMAKE_CROSSCOMPILING)
-    SET(_ei_exec native-expand_instantiations)
+    SET(_ei_exec exported-expand_instantiations)
   ELSE()
     SET(_ei_exec expand_instantiations)
   ENDIF()

diff --git a/deal.II/cmake/scripts/CMakeLists.txt b/deal.II/cmake/scripts/CMakeLists.txt
index 5ac93c43cc2bb55b93e560efbad9b899558550d4..99558adce8273d32a7ba8d75836b5f7fd9b74e6e 100644 (file)
--- a/deal.II/cmake/scripts/CMakeLists.txt
+++ b/deal.II/cmake/scripts/CMakeLists.txt
@@ -20,8 +20,8 @@ IF(NOT CMAKE_CROSSCOMPILING)
   # Export expand_instantiations for use in cross compilation:
   #
   EXPORT(TARGETS expand_instantiations
-    FILE ${CMAKE_CURRENT_BINARY_DIR}/importExecutables.cmake
-    NAMESPACE native- # Prefix a namespace
+    FILE ${CMAKE_BINARY_DIR}/importExecutables.cmake
+    NAMESPACE exported- # Prefix a namespace
     )
 ENDIF()
 

diff --git a/deal.II/cmake/setup_post_project_call.cmake b/deal.II/cmake/setup_post_project_call.cmake
index 690acf5d5d3f9ef357487c385e6913087dc12a1d..8987b3645a1884a61e1d66daddcdf6c50a8ce94e 100644 (file)
--- a/deal.II/cmake/setup_post_project_call.cmake
+++ b/deal.II/cmake/setup_post_project_call.cmake
@@ -49,5 +49,13 @@ IF(CMAKE_CROSSCOMPILING)
   SET(DEAL_II_NATIVE "DEAL_II_NATIVE-NOTFOUND" CACHE FILEPATH
     "A pointer to a native deal.Ii build directory"
     )
-  INCLUDE(${DEAL_II_NATIVE}/cmake/scripts/importExecutables.cmake)
+  INCLUDE(${DEAL_II_NATIVE}/importExecutables.cmake)
 ENDIF()
+
+
+#
+# Cleanup importTargets.cmake
+#
+FILE(REMOVE
+  ${CMAKE_BINARY_DIR}/importTargets.cmake
+  )

diff --git a/deal.II/source/CMakeLists.txt b/deal.II/source/CMakeLists.txt
index bab0c9796ee1bd338f8534ff0a310d9ee4ae761e..e232313269eb55357450999cdc5a309d1008fee9 100644 (file)
--- a/deal.II/source/CMakeLists.txt
+++ b/deal.II/source/CMakeLists.txt
@@ -89,6 +89,12 @@ FOREACH(build ${DEAL_II_BUILD_TYPES})
     ${DEAL_II_EXTERNAL_LIBRARIES}
     )
 
+  EXPORT(TARGETS ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}
+    NAMESPACE exported- # Prefix a namespace
+    FILE ${CMAKE_BINARY_DIR}/importTargets.cmake
+    APPEND
+    )
+
   INSTALL(TARGETS ${DEAL_II_BASE_NAME}${DEAL_II_${build}_SUFFIX}
     EXPORT ${DEAL_II_PROJECT_CONFIG_NAME}Targets
     DESTINATION ${DEAL_II_LIBRARY_RELDIR}