From 85a79f0ca17e1715d862959dcccb85b9d99345cd Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Fri, 7 Apr 2017 16:52:01 +0200 Subject: [PATCH] Enable TkDND on MacOS --- cmake/external_projects/tcltk.cmake | 31 +++++++++++++---------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/cmake/external_projects/tcltk.cmake b/cmake/external_projects/tcltk.cmake index 174a8644..ad8c5e4a 100644 --- a/cmake/external_projects/tcltk.cmake +++ b/cmake/external_projects/tcltk.cmake @@ -30,24 +30,21 @@ if(APPLE) LOG_INSTALL 1 ) - #ExternalProject_Add(tkdnd - #DEPENDS tcl tk - #URL "http://sourceforge.net/projects/tkdnd/files/TkDND/TkDND%202.8/tkdnd2.8-src.tar.gz" - #URL_MD5 a6d47a996ea957416469b12965d4db91 - #DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies - #PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/tkdnd_macosx.patch - #UPDATE_COMMAND "" # Disable update - #BUILD_IN_SOURCE 1 - #CONFIGURE_COMMAND ./configure --with-tcl=${CMAKE_INSTALL_PREFIX}/../Frameworks/Tcl.framework --with-tk=${CMAKE_INSTALL_PREFIX}/../Frameworks/Tk.framework --prefix=${CMAKE_INSTALL_PREFIX}/../MacOS --libdir=${CMAKE_INSTALL_PREFIX}/../MacOS - #BUILD_COMMAND make - #INSTALL_COMMAND make install - #LOG_DOWNLOAD 1 - #LOG_CONFIGURE 1 - #LOG_BUILD 1 - #LOG_INSTALL 1 - #) + ExternalProject_Add(project_tkdnd + URL "https://sourceforge.net/projects/tkdnd/files/OS%20X%20Binaries/TkDND%202.8/tkdnd2.8-OSX-MountainLion.tar.gz" + URL_MD5 2dbb471b1d66c5f391f3c3c5b71548fb + DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND "" + BUILD_COMMAND "" + INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory . ${CMAKE_INSTALL_PREFIX}/../MacOS + LOG_DOWNLOAD 1 + LOG_CONFIGURE 1 + LOG_BUILD 1 + LOG_INSTALL 1 + ) - list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk) + list(APPEND NETGEN_DEPENDENCIES project_tcl project_tk project_tkdnd) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}../Frameworks) set(TCL_INCLUDE_PATH ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tcl.framework/Headers) set(TCL_LIBRARY ${CMAKE_INSTALL_PREFIX}/../Frameworks/Tcl.framework)