summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-09-27 18:27:07 (GMT)
committerBrad King <brad.king@kitware.com>2006-09-27 18:27:07 (GMT)
commitf785ae9ac397aad66443c9c84807c929368c969b (patch)
tree91466c0d0c2074ab5f4e03bcd384c04999466bca
parentdd332a00cc0169221243a231cd2474b6521aa11a (diff)
downloadCMake-f785ae9ac397aad66443c9c84807c929368c969b.zip
CMake-f785ae9ac397aad66443c9c84807c929368c969b.tar.gz
CMake-f785ae9ac397aad66443c9c84807c929368c969b.tar.bz2
ENH: Re-enable preprocessing target test but specifically disable it on broken platforms.
-rw-r--r--Tests/Complex/Library/CMakeLists.txt17
-rw-r--r--Tests/ComplexOneConfig/Library/CMakeLists.txt17
-rw-r--r--Tests/ComplexRelativePaths/Library/CMakeLists.txt17
3 files changed, 48 insertions, 3 deletions
diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt
index 4bb8038..d6403a4 100644
--- a/Tests/Complex/Library/CMakeLists.txt
+++ b/Tests/Complex/Library/CMakeLists.txt
@@ -106,7 +106,22 @@ INSTALL_FILES(/tmp .cxx ${Complex_BINARY_DIR}/cmTestConfigure.h)
# Test generation of preprocessed sources.
IF("${CMAKE_GENERATOR}" MATCHES "Makefile" AND CMAKE_MAKE_PROGRAM)
IF(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE)
- ADD_CUSTOM_TARGET(test_preprocess #ALL
+ # Skip running this part of the test on certain platforms
+ # until they are fixed.
+ SET(MAYBE_ALL ALL)
+ LIST(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_COUNT)
+ IF(ARCH_COUNT GREATER 1)
+ # OSX does not support preprocessing more than one architecture.
+ SET(MAYBE_ALL)
+ ENDIF(ARCH_COUNT GREATER 1)
+ IF("${CMAKE_MAKE_PROGRAM}" MATCHES "msys")
+ # Executing make with a full path at an MSYS prompt produces
+ # a bad path conversion and breaks the child make.
+ SET(MAYBE_ALL)
+ ENDIF("${CMAKE_MAKE_PROGRAM}" MATCHES "msys")
+
+ # Custom target to try preprocessing invocation.
+ ADD_CUSTOM_TARGET(test_preprocess ${MAYBE_ALL}
COMMAND ${CMAKE_COMMAND} -E remove CMakeFiles/create_file.dir/create_file.i
COMMAND ${CMAKE_MAKE_PROGRAM} create_file.i
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/test_preprocess.cmake
diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt
index 4bb8038..d6403a4 100644
--- a/Tests/ComplexOneConfig/Library/CMakeLists.txt
+++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt
@@ -106,7 +106,22 @@ INSTALL_FILES(/tmp .cxx ${Complex_BINARY_DIR}/cmTestConfigure.h)
# Test generation of preprocessed sources.
IF("${CMAKE_GENERATOR}" MATCHES "Makefile" AND CMAKE_MAKE_PROGRAM)
IF(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE)
- ADD_CUSTOM_TARGET(test_preprocess #ALL
+ # Skip running this part of the test on certain platforms
+ # until they are fixed.
+ SET(MAYBE_ALL ALL)
+ LIST(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_COUNT)
+ IF(ARCH_COUNT GREATER 1)
+ # OSX does not support preprocessing more than one architecture.
+ SET(MAYBE_ALL)
+ ENDIF(ARCH_COUNT GREATER 1)
+ IF("${CMAKE_MAKE_PROGRAM}" MATCHES "msys")
+ # Executing make with a full path at an MSYS prompt produces
+ # a bad path conversion and breaks the child make.
+ SET(MAYBE_ALL)
+ ENDIF("${CMAKE_MAKE_PROGRAM}" MATCHES "msys")
+
+ # Custom target to try preprocessing invocation.
+ ADD_CUSTOM_TARGET(test_preprocess ${MAYBE_ALL}
COMMAND ${CMAKE_COMMAND} -E remove CMakeFiles/create_file.dir/create_file.i
COMMAND ${CMAKE_MAKE_PROGRAM} create_file.i
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/test_preprocess.cmake
diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt
index 4bb8038..d6403a4 100644
--- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt
+++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt
@@ -106,7 +106,22 @@ INSTALL_FILES(/tmp .cxx ${Complex_BINARY_DIR}/cmTestConfigure.h)
# Test generation of preprocessed sources.
IF("${CMAKE_GENERATOR}" MATCHES "Makefile" AND CMAKE_MAKE_PROGRAM)
IF(CMAKE_CXX_CREATE_PREPROCESSED_SOURCE)
- ADD_CUSTOM_TARGET(test_preprocess #ALL
+ # Skip running this part of the test on certain platforms
+ # until they are fixed.
+ SET(MAYBE_ALL ALL)
+ LIST(LENGTH CMAKE_OSX_ARCHITECTURES ARCH_COUNT)
+ IF(ARCH_COUNT GREATER 1)
+ # OSX does not support preprocessing more than one architecture.
+ SET(MAYBE_ALL)
+ ENDIF(ARCH_COUNT GREATER 1)
+ IF("${CMAKE_MAKE_PROGRAM}" MATCHES "msys")
+ # Executing make with a full path at an MSYS prompt produces
+ # a bad path conversion and breaks the child make.
+ SET(MAYBE_ALL)
+ ENDIF("${CMAKE_MAKE_PROGRAM}" MATCHES "msys")
+
+ # Custom target to try preprocessing invocation.
+ ADD_CUSTOM_TARGET(test_preprocess ${MAYBE_ALL}
COMMAND ${CMAKE_COMMAND} -E remove CMakeFiles/create_file.dir/create_file.i
COMMAND ${CMAKE_MAKE_PROGRAM} create_file.i
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/test_preprocess.cmake