osx superbuild fix

This commit is contained in:
Joachim Schöberl 2017-01-10 16:04:34 +01:00
parent 99b5dc571e
commit 98a43821ae

View File

@ -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