]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Split info message on mac.
authorLuca Heltai <luca.heltai@sissa.it>
Mon, 14 Mar 2016 09:08:41 +0000 (10:08 +0100)
committerLuca Heltai <luca.heltai@sissa.it>
Mon, 14 Mar 2016 09:08:41 +0000 (10:08 +0100)
cmake/setup_custom_targets.cmake

index e3782000caf933425abd5985358435b7e8870b0d..c3d9e58b4f947aafc60ed9ddc73c28d9c7448fd4 100644 (file)
@@ -99,19 +99,6 @@ ADD_CUSTOM_TARGET(indent
   COMMENT "Indenting all files in the deal.II directories"
   )
 
-#
-# Provide "relocate" target to run install_name_tool on all external libraries
-# under ${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}
-#
-IF(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND 
-  NOT "${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}" STREQUAL "")
-  ADD_CUSTOM_TARGET(relocate
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ./contrib/utilities/relocate_libraries.py
-    COMMENT "Running install_name_tool under ${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}"
-    )
-ENDIF()
-
 
 #
 # Provide an "info" target to print a help message:
@@ -152,12 +139,30 @@ FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_info.cmake
 #    prune_tests    - remove all testsuite subprojects
 #
 #    indent         - indent all headers and source file
+")
+
 #
-#    relocate       - (only available on Darwin machines) fix RPATH for external 
-#                     libraries, if packaging was requested
+# Provide "relocate" target to run install_name_tool on all external libraries
+# under ${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}
 #
+IF(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND 
+  NOT "${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}" STREQUAL "")
+  ADD_CUSTOM_TARGET(relocate
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ./contrib/utilities/relocate_libraries.py
+    COMMENT "Running install_name_tool under ${DEAL_II_CPACK_EXTERNAL_LIBS_TREE}"
+    )
+  FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_info.cmake
+  "#
+#    relocate       - fix RPATH for external libraries, if packaging was requested
+"
+   )
+ENDIF()
+
+FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_info.cmake
+"#
 ###\")"
-  )
+)
 
 ADD_CUSTOM_TARGET(info
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/print_info.cmake

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.