kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: disable packaging test on Apple, see if this fixes the timeouts

Browse Source 
Alex
This commit is contained in:
Alexander Neundorf 2007-09-17 16:21:24 -04:00
parent 96235da3b4
commit 2f7f5eb04a
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/SimpleInstall/CMakeLists.txt
View File

@ -333,6 +333,13 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries) INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack) 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( ADD_CUSTOM_COMMAND(
TARGET ${install_target} TARGET ${install_target}
POST_BUILD POST_BUILD
@ -346,6 +353,6 @@ ADD_CUSTOM_COMMAND(
--build-makeprogram ${CMAKE_MAKE_PROGRAM} --build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-noclean --build-noclean
--build-target install --build-target install
--build-target package ${PACKAGE_TARGET}
COMMENT "Install Project" COMMENT "Install Project"
) )

9
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -333,6 +333,13 @@ SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries) INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack) 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( ADD_CUSTOM_COMMAND(
TARGET ${install_target} TARGET ${install_target}
POST_BUILD POST_BUILD
@ -346,6 +353,6 @@ ADD_CUSTOM_COMMAND(
--build-makeprogram ${CMAKE_MAKE_PROGRAM} --build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-noclean --build-noclean
--build-target install --build-target install
--build-target package ${PACKAGE_TARGET}
COMMENT "Install Project" COMMENT "Install Project"
) )