ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-09-22 17:52:50 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of geras.asc.tuwien.ac.at:jschoeberl/netgen

Browse Source
This commit is contained in:
Joachim Schöberl 2019-09-03 07:12:05 +02:00
commit 194dd29d0b
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/external_projects/tcltk.cmake
View File

@ -30,19 +30,23 @@ if(APPLE)
) )
ExternalProject_Add(project_tkdnd ExternalProject_Add(project_tkdnd
URL "https://sourceforge.net/projects/tkdnd/files/OS%20X%20Binaries/TkDND%202.8/tkdnd2.8-OSX-MountainLion.tar.gz" URL "http://sourceforge.net/projects/tkdnd/files/TkDND/TkDND%202.8/tkdnd2.8-src.tar.gz"
URL_MD5 2dbb471b1d66c5f391f3c3c5b71548fb URL_MD5 a6d47a996ea957416469b12965d4db91
DEPENDS project_tcl project_tk
DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies
PATCH_COMMAND patch < ${CMAKE_CURRENT_LIST_DIR}/tkdnd_macosx.patch
UPDATE_COMMAND "" # Disable update
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
CONFIGURE_COMMAND "" CMAKE_ARGS
BUILD_COMMAND "" -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/Contents/MacOS
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory . ${CMAKE_INSTALL_PREFIX}/../MacOS -DTCL_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/Headers
-DTK_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tk.framework/Headers
LOG_DOWNLOAD 1 LOG_DOWNLOAD 1
LOG_CONFIGURE 1 LOG_CONFIGURE 1
LOG_BUILD 1 LOG_BUILD 1
LOG_INSTALL 1 LOG_INSTALL 1
) )
list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk project_tkdnd) list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk project_tkdnd)
list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks)
set(TCL_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/Headers) set(TCL_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/Contents/Frameworks/Tcl.framework/Headers)

17
cmake/external_projects/tkdnd_macosx.patch
View File

@ -1,6 +1,8 @@
--- CMakeLists.txt 19:24:32.000000000 +0200 diff --git a/CMakeLists.txt b/CMakeLists.txt
+++ CMakeLists.txt 2018-12-05 11:34:59.000000000 +0100 index 4eb497c..cd22a67 100644
@@ -43,17 +43,18 @@ --- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,17 +43,18 @@ IF ( WIN32 )
ELSE ( WIN32 ) ELSE ( WIN32 )
## Unix and OS X... ## Unix and OS X...
IF ( APPLE ) IF ( APPLE )
@ -24,7 +26,7 @@
ADD_DEFINITIONS ( -fno-objc-arc ) ADD_DEFINITIONS ( -fno-objc-arc )
# ADD_DEFINITIONS ( -fobjc-arc ) # ADD_DEFINITIONS ( -fobjc-arc )
LINK_LIBRARIES ( ${COCOA_LIBRARY} ) LINK_LIBRARIES ( ${COCOA_LIBRARY} )
@@ -125,8 +126,8 @@ @@ -125,8 +126,8 @@ SET ( CP ${CMAKE_COMMAND} -E copy )
## Locate Tcl/Tk ## Locate Tcl/Tk
## =========================================================================== ## ===========================================================================
MESSAGE ( STATUS "Searching for Tcl/Tk..." ) MESSAGE ( STATUS "Searching for Tcl/Tk..." )
@ -35,7 +37,7 @@
## Tcl/Tk info (useful for debug purposes)... ## Tcl/Tk info (useful for debug purposes)...
# MESSAGE ( STATUS " TCL_TCLSH: " ${TCL_TCLSH} ) # MESSAGE ( STATUS " TCL_TCLSH: " ${TCL_TCLSH} )
@@ -139,13 +140,13 @@ @@ -139,13 +140,14 @@ FIND_PACKAGE ( TclStub REQUIRED )
# MESSAGE ( STATUS " TK_LIBRARY: " ${TK_LIBRARY} ) # MESSAGE ( STATUS " TK_LIBRARY: " ${TK_LIBRARY} )
## Enable Tcl/Tk stubs globally... ## Enable Tcl/Tk stubs globally...
@ -48,8 +50,9 @@
INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH} ) INCLUDE_DIRECTORIES ( ${TK_INCLUDE_PATH} )
-LINK_LIBRARIES ( ${TCL_STUB_LIBRARY} ) -LINK_LIBRARIES ( ${TCL_STUB_LIBRARY} )
-LINK_LIBRARIES ( ${TK_STUB_LIBRARY} ) -LINK_LIBRARIES ( ${TK_STUB_LIBRARY} )
+LINK_LIBRARIES ( ${TCL_LIBRARY} ) +#LINK_LIBRARIES ( ${TCL_LIBRARY} )
+LINK_LIBRARIES ( ${TK_LIBRARY} ) +#LINK_LIBRARIES ( ${TK_LIBRARY} )
+SET ( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -undefined dynamic_lookup" )
IF ( WIN32 AND NO_MSVCRT ) IF ( WIN32 AND NO_MSVCRT )
STRING ( REPLACE /MD /MT CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} ) STRING ( REPLACE /MD /MT CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} )