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

Fixes for MacOS build

Browse Source
This commit is contained in:
Matthias Hochsteger 2017-01-15 19:32:59 +01:00
parent ff8e405afb
commit 2d63931130
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -335,7 +335,7 @@ export NETGENDIR=$Netgen_MACOS
export DYLD_LIBRARY_PATH=$Netgen_MACOS:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH=$Netgen_MACOS:$DYLD_LIBRARY_PATH
# export TIX_LIBRARY=$Netgen_MACOS/library # export TIX_LIBRARY=$Netgen_MACOS/library
# 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/${PYTHON_PACKAGES_INSTALL_DIR}:$PYTHONPATH
cd $Netgen_MACOS cd $Netgen_MACOS
$Netgen_MACOS/netgen $Netgen_MACOS/netgen
") ")

16
cmake_modules/ExternalProject_TCLTK.cmake
View File

@ -7,7 +7,7 @@ if(APPLE)
UPDATE_COMMAND "" # Disable update UPDATE_COMMAND "" # Disable update
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND make -C macosx install INSTALL_ROOT=${CMAKE_INSTALL_PREFIX}/../ INSTALL_PATH=/Frameworks #NATIVE_TCLSH=${HOME}/usr/local/bin/tclsh BUILD_COMMAND make -C macosx install-embedded INSTALL_ROOT=/ INSTALL_PATH=${CMAKE_INSTALL_PREFIX}/../Frameworks
INSTALL_COMMAND "" INSTALL_COMMAND ""
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
LOG_BUILD 1 LOG_BUILD 1
@ -20,9 +20,10 @@ if(APPLE)
URL_MD5 261754d7dc2a582f00e35547777e1fea URL_MD5 261754d7dc2a582f00e35547777e1fea
DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
UPDATE_COMMAND "" # Disable update UPDATE_COMMAND "" # Disable update
PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/tk_macosx.patch
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND make -C macosx install INSTALL_ROOT=${CMAKE_INSTALL_PREFIX}/../ INSTALL_PATH=/Frameworks BUILD_COMMAND make -C macosx install-embedded INSTALL_ROOT=/ INSTALL_PATH=${CMAKE_INSTALL_PREFIX}/../Frameworks TCL_FRAMEWORK_DIR=${CMAKE_INSTALL_PREFIX}/../Frameworks/Tcl.framework
INSTALL_COMMAND ""#make -C macosx install INSTALL_COMMAND ""#make -C macosx install
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
LOG_BUILD 1 LOG_BUILD 1
@ -47,12 +48,11 @@ if(APPLE)
) )
list(APPEND NETGEN_DEPENDENCIES tcl tk tkdnd) list(APPEND NETGEN_DEPENDENCIES tcl tk tkdnd)
set(TCL_INCLUDE_PATH ${HOME}/Library/Frameworks/Tcl.framework/Headers) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}../Frameworks)
set(TCL_LIBRARY ${HOME}/Library/Frameworks/Tcl.framework) set(TCL_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tcl.framework/Headers)
set(TK_LIBRARY ${HOME}/Library/Frameworks/Tk.framework) set(TCL_LIBRARY ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tcl.framework)
set(TK_INCLUDE_PATH ${HOME}/Library/Frameworks/Tk.framework/Headers) set(TK_LIBRARY ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tk.framework)
set(TCL_TCLSH ${HOME}/usr/local/bin/tclsh) set(TK_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tk.framework/Headers)
set(TK_WISH ${HOME}/usr/local/bin/wish)
elseif(WIN32) elseif(WIN32)

1
cmake_modules/SuperBuild.cmake
View File

@ -132,6 +132,7 @@ set_vars( NETGEN_CMAKE_ARGS
INSTALL_DIR INSTALL_DIR
INSTALL_DEPENDENCIES INSTALL_DEPENDENCIES
INTEL_MIC INTEL_MIC
CMAKE_PREFIX_PATH
) )
if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") if(${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")