From 98a43821ae0cecef368f7cb93495e1f55f30a4fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Sch=C3=B6berl?= Date: Tue, 10 Jan 2017 16:04:34 +0100 Subject: [PATCH] osx superbuild fix --- cmake_modules/ExternalProject_TCLTK.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake_modules/ExternalProject_TCLTK.cmake b/cmake_modules/ExternalProject_TCLTK.cmake index 56eb36c2..94b4c4ce 100644 --- a/cmake_modules/ExternalProject_TCLTK.cmake +++ b/cmake_modules/ExternalProject_TCLTK.cmake @@ -5,7 +5,7 @@ if(APPLE) UPDATE_COMMAND "" # Disable update BUILD_IN_SOURCE 1 CONFIGURE_COMMAND "" - BUILD_COMMAND make -C macosx install-embedded INSTALL_ROOT=${INSTALL_DIR}/../../ INSTALL_PATH=/Frameworks #NATIVE_TCLSH=${HOME}/usr/local/bin/tclsh + BUILD_COMMAND make -C macosx install INSTALL_ROOT=${CMAKE_INSTALL_PREFIX}/../ INSTALL_PATH=/Frameworks #NATIVE_TCLSH=${HOME}/usr/local/bin/tclsh INSTALL_COMMAND "" LOG_DOWNLOAD 1 LOG_BUILD 1 @@ -18,7 +18,7 @@ if(APPLE) UPDATE_COMMAND "" # Disable update BUILD_IN_SOURCE 1 CONFIGURE_COMMAND "" - BUILD_COMMAND make -C macosx install-embedded INSTALL_ROOT=${INSTALL_DIR}/../../ INSTALL_PATH=/Frameworks + BUILD_COMMAND make -C macosx install INSTALL_ROOT=${CMAKE_INSTALL_PREFIX}/../ INSTALL_PATH=/Frameworks INSTALL_COMMAND ""#make -C macosx install LOG_DOWNLOAD 1 LOG_BUILD 1 @@ -31,7 +31,7 @@ if(APPLE) PATCH_COMMAND patch -p1 < ${CMAKE_CURRENT_LIST_DIR}/tkdnd_macosx.patch UPDATE_COMMAND "" # Disable update BUILD_IN_SOURCE 1 - CONFIGURE_COMMAND ./configure --with-tcl=${INSTALL_DIR}/../../Frameworks/Tcl.framework --with-tk=${INSTALL_DIR}/../../Frameworks/Tk.framework --prefix=${INSTALL_DIR} + 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