Commit bdc5446d authored by whitlocb's avatar whitlocb
Browse files

Fix location of osxfixup for out of source build.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9699 18c085ea-50e0-402c-830e-de6fd14e8384
parent 7e351560
......@@ -89,7 +89,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
STRING(REGEX MATCH "${frameworkNameWE}[A-Za-z0-9._/-]*" frameworkMatch ${realFramework})
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -112,7 +112,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
GET_FILENAME_COMPONENT(libName ${curNAMEWithExt} NAME)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -138,7 +138,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
STRING(REGEX MATCH "${frameworkNameWE}[A-Za-z0-9._/-]*" frameworkMatch ${realFramework})
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -166,7 +166,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
GET_FILENAME_COMPONENT(libName ${tmpLIBFILE} NAME)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......
......@@ -307,7 +307,7 @@ MACRO(VISIT_INSTALL_TARGETS)
SET(filename lib${target}.dylib)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${filename}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -320,14 +320,14 @@ MACRO(VISIT_INSTALL_TARGETS)
IF(${bundle} STREQUAL "ON")
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -bundle ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN} ${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -bundle ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN} ${filename}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
ELSE(${bundle} STREQUAL "ON")
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -exe ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN}/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -exe ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN}/${filename}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -351,7 +351,7 @@ MACRO(VISIT_INSTALL_DATABASE_PLUGINS)
SET(filename lib${target}.dylib)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/databases/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/databases/${filename}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -373,7 +373,7 @@ MACRO(VISIT_INSTALL_OPERATOR_PLUGINS)
SET(filename lib${target}.dylib)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/operators/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/operators/${filename}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -395,7 +395,7 @@ MACRO(VISIT_INSTALL_PLOT_PLUGINS)
SET(filename lib${target}.dylib)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_BINARY_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/plots/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/plots/${filename}
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment