Commit e9cb6226 authored by whitlocb's avatar whitlocb
Browse files

Fixed header file and library installation so it does not depend on build type.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@9707 18c085ea-50e0-402c-830e-de6fd14e8384
parent 5177a15a
......@@ -80,7 +80,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
DESTINATION ${VISIT_INSTALLED_VERSION_LIB}
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
# On Apple, we need to make the framework be executable relative
......@@ -97,7 +97,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
INSTALL(FILES ${curNAMEWithExt}
DESTINATION ${VISIT_INSTALLED_VERSION_LIB}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
# On Windows, we also need to copy the file to the
# binary dir so our out of source builds can run.
......@@ -129,7 +129,8 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
DESTINATION ${VISIT_INSTALLED_VERSION_LIB}
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
PATTERN "Qt*_debug" EXCLUDE # Exclude Qt*_debug libraries in framework.
)
# On Apple, we need to make the framework be executable relative
......@@ -147,7 +148,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
INSTALL(FILES ${tmpLIBFILE}
DESTINATION ${VISIT_INSTALLED_VERSION_LIB}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
# On Windows, we also need to copy the file to the binary dir so
......@@ -181,7 +182,7 @@ FUNCTION(THIRD_PARTY_INSTALL_LIBRARY LIBFILE)
INSTALL(FILES ${tmpLIBFILE}
DESTINATION ${VISIT_INSTALLED_VERSION_ARCHIVES}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
# TODO: We could install windows import libraries here...
......@@ -203,7 +204,7 @@ FUNCTION(THIRD_PARTY_INSTALL_INCLUDE pkg incdir)
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/${lcpkg}
DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.H"
......
......@@ -287,7 +287,7 @@ MACRO(VISIT_INSTALL_TARGETS)
LIBRARY DESTINATION ${VISIT_INSTALLED_VERSION_LIB}
ARCHIVE DESTINATION ${VISIT_INSTALLED_VERSION_ARCHIVES}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
ENDIF(NOT ${pType} STREQUAL "STATIC_LIBRARY")
ENDFOREACH(T)
......@@ -298,7 +298,7 @@ MACRO(VISIT_INSTALL_TARGETS)
LIBRARY DESTINATION ${VISIT_INSTALLED_VERSION_LIB}
ARCHIVE DESTINATION ${VISIT_INSTALLED_VERSION_ARCHIVES}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
IF(APPLE)
FOREACH(target ${ARGN})
......@@ -344,7 +344,7 @@ MACRO(VISIT_INSTALL_DATABASE_PLUGINS)
LIBRARY DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/databases
RUNTIME DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/databases
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
IF(APPLE)
FOREACH(target ${ARGN})
......@@ -366,7 +366,7 @@ MACRO(VISIT_INSTALL_OPERATOR_PLUGINS)
LIBRARY DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/operators
RUNTIME DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/operators
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
IF(APPLE)
FOREACH(target ${ARGN})
......@@ -388,7 +388,7 @@ MACRO(VISIT_INSTALL_PLOT_PLUGINS)
LIBRARY DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/plots
RUNTIME DESTINATION ${VISIT_INSTALLED_VERSION_PLUGINS}/plots
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
)
IF(APPLE)
FOREACH(target ${ARGN})
......@@ -409,7 +409,7 @@ INSTALL(DIRECTORY avt common engine gui launcher mdserver third_party_builtin vi
DESTINATION ${VISIT_INSTALLED_VERSION_INCLUDE}/visit
FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_WRITE GROUP_READ WORLD_READ
DIRECTORY_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_WRITE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
CONFIGURATIONS Debug;Release
CONFIGURATIONS "";None;Debug;Release;RelWithDebInfo;MinSizeRel
FILES_MATCHING PATTERN "*.h"
PATTERN ".svn" EXCLUDE
PATTERN "CMakeFiles" EXCLUDE
......
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