ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-25 05:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

OSX: binary is called netgen again

Browse Source
This commit is contained in:
Joachim Schöberl 2016-02-23 13:08:09 +01:00
parent 402e85cc17
commit 87180ba342
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -303,7 +303,7 @@ message(\${APP})
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)
# set(libs ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib}/libTix8.4.3.dylib) # set(libs ${CMAKE_INSTALL_PREFIX}/${ng_install_dir_lib}/libTix8.4.3.dylib)
message(\"\${libs}\") message(\"\${libs}\")
netgen_fixup_bundle( \${APP}/Contents/MacOS/netgen_main \"\${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)
@ -379,18 +379,18 @@ export DYLD_LIBRARY_PATH=$Netgen_MACOS:$DYLD_LIBRARY_PATH
# export TCLLIBPATH=$Netgen_MACOS:$TCLLIBPATH # export TCLLIBPATH=$Netgen_MACOS:$TCLLIBPATH
export PYTHONPATH=$Netgen_BUNDLE/Contents/Resources/lib/python3.5/site-packages:$PYTHONPATH export PYTHONPATH=$Netgen_BUNDLE/Contents/Resources/lib/python3.5/site-packages:$PYTHONPATH
cd $Netgen_MACOS cd $Netgen_MACOS
$Netgen_MACOS/netgen_main $Netgen_MACOS/netgen
") ")
install(PROGRAMS ${mac_startup} DESTINATION ${ng_install_dir_bin}) install(PROGRAMS ${mac_startup} DESTINATION ${ng_install_dir_bin})
set(mac_ngsuite ${CMAKE_CURRENT_BINARY_DIR}/ngsuite.sh) set(mac_ngsuite ${CMAKE_CURRENT_BINARY_DIR}/ngsuite.sh)
file(WRITE ${mac_ngsuite} "\ file(WRITE ${mac_ngsuite} "\
#!/bin/sh #!/bin/sh
Netgen_BUNDLE=\"`echo \"$0\" | sed -e 's/\\/Contents\\/MacOS\\/Netgen//'`\" Netgen_BUNDLE=\"`echo \"$0\" | sed -e 's/\\/Contents\\/MacOS\\/Netgen1//'`\"
Netgen_MACOS=\"$Netgen_BUNDLE/Contents/MacOS\" Netgen_MACOS=\"$Netgen_BUNDLE/Contents/MacOS\"
open -a /Applications/Utilities/Terminal.app $Netgen_MACOS/startup.sh open -a /Applications/Utilities/Terminal.app $Netgen_MACOS/startup.sh
") ")
install(PROGRAMS ${mac_ngsuite} DESTINATION ../MacOS RENAME Netgen) install(PROGRAMS ${mac_ngsuite} DESTINATION ../MacOS RENAME Netgen1)
set(mac_plist ${CMAKE_CURRENT_BINARY_DIR}/Info.plist) set(mac_plist ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
file(WRITE ${mac_plist} "<?xml version=\"1.0\" encoding=\"UTF-8\"?> file(WRITE ${mac_plist} "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
@ -400,7 +400,7 @@ open -a /Applications/Utilities/Terminal.app $Netgen_MACOS/startup.sh
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>Netgen</string> <string>Netgen1</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>Netgen.icns</string> <string>Netgen.icns</string>
<key>NSHighResolutionCapable</key> <key>NSHighResolutionCapable</key>

2
ng/CMakeLists.txt
View File

@ -15,7 +15,7 @@ if(USE_GUI)
install(TARGETS netgen ${ng_install_dir}) install(TARGETS netgen ${ng_install_dir})
if(APPLE) if(APPLE)
set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen_main) set_target_properties(netgen PROPERTIES OUTPUT_NAME netgen)
endif(APPLE) endif(APPLE)
endif(USE_GUI) endif(USE_GUI)