summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Tests/SimpleInstall/CMakeLists.txt9
-rw-r--r--Tests/SimpleInstallS2/CMakeLists.txt9
2 files changed, 16 insertions, 2 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt
index 99ee6b5..503cd0d 100644
--- a/Tests/SimpleInstall/CMakeLists.txt
+++ b/Tests/SimpleInstall/CMakeLists.txt
@@ -333,6 +333,13 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack)
+# disable packaging on Apple, since this includes the /Applications dir
+# where a symbolic link is created by cmCPackOSXX11Generator.cxx
+SET(PACKAGE_TARGET --build-target package)
+IF(APPLE AND NOT CTEST_TEST_CPACK)
+ SET(PACKAGE_TARGET)
+ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
+
ADD_CUSTOM_COMMAND(
TARGET ${install_target}
POST_BUILD
@@ -346,6 +353,6 @@ ADD_CUSTOM_COMMAND(
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-noclean
--build-target install
- --build-target package
+ ${PACKAGE_TARGET}
COMMENT "Install Project"
)
diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt
index 99ee6b5..503cd0d 100644
--- a/Tests/SimpleInstallS2/CMakeLists.txt
+++ b/Tests/SimpleInstallS2/CMakeLists.txt
@@ -333,6 +333,13 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack)
+# disable packaging on Apple, since this includes the /Applications dir
+# where a symbolic link is created by cmCPackOSXX11Generator.cxx
+SET(PACKAGE_TARGET --build-target package)
+IF(APPLE AND NOT CTEST_TEST_CPACK)
+ SET(PACKAGE_TARGET)
+ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
+
ADD_CUSTOM_COMMAND(
TARGET ${install_target}
POST_BUILD
@@ -346,6 +353,6 @@ ADD_CUSTOM_COMMAND(
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-noclean
--build-target install
- --build-target package
+ ${PACKAGE_TARGET}
COMMENT "Install Project"
)