Commit 99373c53 authored by whitlocb's avatar whitlocb
Browse files

I fixed osxfixup so it works with both install and package targets.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@10836 18c085ea-50e0-402c-830e-de6fd14e8384
parent eb37323e
......@@ -179,7 +179,7 @@ IF(EXISTS ${VTK_PY_WRAPPERS_DIR}/site-packages/vtk)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib
${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/site-packages/vtk/${libname}
\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/site-packages/vtk/${libname}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......
......@@ -152,7 +152,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_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -168,7 +168,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_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -195,7 +195,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_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${frameworkMatch}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -212,7 +212,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_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${libName}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......
......@@ -393,7 +393,7 @@ MACRO(VISIT_INSTALL_TARGETS)
SET(filename lib${target}.dylib)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_LIB}/${filename}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -406,14 +406,14 @@ MACRO(VISIT_INSTALL_TARGETS)
IF(${bundle} STREQUAL "ON")
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -bundle ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN} ${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -bundle \"\$ENV{DESTDIR}\${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_SOURCE_DIR}/CMake/osxfixup -exe ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN}/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -exe \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_BIN}/${filename}\"
OUTPUT_VARIABLE OSXOUT)
MESSAGE(STATUS \"\${OSXOUT}\")
")
......@@ -460,7 +460,7 @@ MACRO(VISIT_INSTALL_PLUGINS type)
SET(filename lib${target}.dylib)
INSTALL(CODE
"EXECUTE_PROCESS(WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib ${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/${type}/${filename}
COMMAND /bin/sh ${VISIT_SOURCE_DIR}/CMake/osxfixup -lib \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${VISIT_INSTALLED_VERSION_PLUGINS}/${type}/${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