From 26fcc2b177aa876de32a600f3c9590f6d0cff12f Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Mon, 2 Sep 2019 23:35:02 +0200 Subject: [PATCH] Build Tcl/Tk 8.6.10-rc on MacOS --- cmake/external_projects/tcltk.cmake | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/cmake/external_projects/tcltk.cmake b/cmake/external_projects/tcltk.cmake index 14ac0449..480bebc7 100644 --- a/cmake/external_projects/tcltk.cmake +++ b/cmake/external_projects/tcltk.cmake @@ -1,10 +1,12 @@ if(APPLE) set(tcl_prefix ${CMAKE_INSTALL_PREFIX}) + # URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tcl8.6.9-src.tar.gz" + # URL_MD5 aa0a121d95a0e7b73a036f26028538d4 ExternalProject_Add(project_tcl - URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tcl8.6.9-src.tar.gz" - URL_MD5 aa0a121d95a0e7b73a036f26028538d4 + URL "https://core.tcl-lang.org/tcl/tarball/87e71bd13b/tcl-87e71bd13b.tar.gz" + URL_MD5 6f3393b9598fd32d5acb23b22dac9701 DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies - UPDATE_COMMAND "" # Disable update + UPDATE_COMMAND bash -c "cd ../project_tcl/macosx && autoconf" CONFIGURE_COMMAND ../project_tcl/macosx/configure --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin BUILD_COMMAND make -j4 binaries libraries INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers @@ -14,12 +16,14 @@ if(APPLE) LOG_INSTALL 1 ) + # URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tk8.6.9.1-src.tar.gz" + # URL_MD5 9efe3976468352dc894dae0c4e785a8e ExternalProject_Add(project_tk DEPENDS project_tcl - URL "http://sourceforge.net/projects/tcl/files/Tcl/8.6.9/tk8.6.9.1-src.tar.gz" - URL_MD5 9efe3976468352dc894dae0c4e785a8e + URL "https://mirror1.tcl.tk/tk/tarball/e23f0c31ac/tk-e23f0c31ac.tar.gz" + URL_MD5 c973bcaedc82103deae2d78eede84a2e DOWNLOAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external_dependencies - UPDATE_COMMAND "" # Disable update + UPDATE_COMMAND bash -c "cd ../project_tk/macosx && autoconf" CONFIGURE_COMMAND ../project_tk/macosx/configure --enable-aqua=yes --enable-threads --enable-framework --prefix=${tcl_prefix} --libdir=${tcl_prefix}/Contents/Frameworks --bindir=${tcl_prefix}/Contents/Frameworks/Tcl.framework/bin --with-tcl=${tcl_prefix}/Contents/Frameworks/Tcl.framework BUILD_COMMAND make -j4 binaries libraries INSTALL_COMMAND make install-binaries install-headers install-libraries install-private-headers