From: Luca Heltai Date: Mon, 14 Mar 2016 09:08:41 +0000 (+0100) Subject: Split info message on mac. X-Git-Tag: v8.5.0-rc1~1207^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c38acbfd1e08f9836792c4ef1bf7723d2f4d6af;p=dealii.git Split info message on mac. --- diff --git a/cmake/setup_custom_targets.cmake b/cmake/setup_custom_targets.cmake index e3782000ca..c3d9e58b4f 100644 --- a/cmake/setup_custom_targets.cmake +++ b/cmake/setup_custom_targets.cmake @@ -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