fix for last commit

This commit is contained in:
Matthias Hochsteger 2017-02-22 12:48:15 +01:00
parent aa34a214bf
commit ea00690a2a

View File

@ -69,7 +69,7 @@ if (ADDITIONAL_PATHS)
endif (ADDITIONAL_PATHS) endif (ADDITIONAL_PATHS)
if(APPLE) if(APPLE)
set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}/Netgen.app/Contents/Resources" CACHE INTERNAL "Prefix prepended to install directories" FORCE) set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}/Contents/Resources" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
else(APPLE) else(APPLE)
set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories" FORCE) set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories" FORCE)
endif(APPLE) endif(APPLE)
@ -242,14 +242,14 @@ endif(INSTALL_PROFILES)
####################################################################### #######################################################################
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/fixup.cmake "\ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/fixup.cmake "\
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/netgen_fixup.cmake) include(${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/netgen_fixup.cmake)
set(APP ${INSTALL_DIR}/Netgen.app) set(APP ${INSTALL_DIR})
message(\${APP}) message(\${APP})
set(BU_CHMOD_BUNDLE_ITEMS ON) set(BU_CHMOD_BUNDLE_ITEMS ON)
file(GLOB libs ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib}/*.dylib ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib}/*.so) file(GLOB libs ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib}/*.dylib ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib}/*.so)
message(\"\${libs}\") message(\"\${libs}\")
netgen_fixup_bundle( \${APP}/Contents/MacOS/netgen \"\${libs}\" ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib} ) netgen_fixup_bundle( \${APP}/Contents/MacOS/netgen \"\${libs}\" ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib} )
execute_process(COMMAND ln -s /Applications ${INSTALL_DIR}/Applications) execute_process(COMMAND ln -s /Applications ${INSTALL_DIR}/../Applications)
set (bundle_filename \$ENV{NETGEN_BUNDLE_NAME}) set (bundle_filename \$ENV{NETGEN_BUNDLE_NAME})
if(NOT bundle_filename) if(NOT bundle_filename)
set(bundle_filename netgen) set(bundle_filename netgen)