From f785ae9ac397aad66443c9c84807c929368c969b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 27 Sep 2006 14:27:07 -0400 Subject: ENH: Re-enable preprocessing target test but specifically disable it on broken platforms. --- Tests/Complex/Library/CMakeLists.txt | 17 ++++++++++++++++- Tests/ComplexOneConfig/Library/CMakeLists.txt | 17 ++++++++++++++++- Tests/ComplexRelativePaths/Library/CMakeLists.txt | 17 ++++++++++++++++- 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 -- cgit v0.12