diff options
| author | Brad King <brad.king@kitware.com> | 2007-12-29 04:07:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-12-29 04:07:26 (GMT) |
| commit | 3efc6e40cb6ae2f3c73a6a1b9d483ca12f9861d6 (patch) | |
| tree | 3a8d814f2d121e14e1f8dfd0fb80cc358414a694 /Tests/ExternalOBJ | |
| parent | f872c10b7ee3fe675e7a2066c20c7a749efd8238 (diff) | |
| download | CMake-3efc6e40cb6ae2f3c73a6a1b9d483ca12f9861d6.zip CMake-3efc6e40cb6ae2f3c73a6a1b9d483ca12f9861d6.tar.gz CMake-3efc6e40cb6ae2f3c73a6a1b9d483ca12f9861d6.tar.bz2 | |
BUG: Do not remove the source file extension when computing an object file name. This addresses bug #6169. If CMAKE_BACKWARDS_COMPATIBILITY is 2.4 or lower maintain the old behavior so that existing build trees and old project releases are not affected.
Diffstat (limited to 'Tests/ExternalOBJ')
| -rw-r--r-- | Tests/ExternalOBJ/CMakeLists.txt | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/Tests/ExternalOBJ/CMakeLists.txt b/Tests/ExternalOBJ/CMakeLists.txt index 5ad2a5a..1db0515 100644 --- a/Tests/ExternalOBJ/CMakeLists.txt +++ b/Tests/ExternalOBJ/CMakeLists.txt @@ -18,37 +18,26 @@ TRY_COMPILE(EXTERNAL_OBJECT_BUILT external OUTPUT_VARIABLE OUTPUT ) -SET(EXTERNAL_OBJECT_NAME "external_object${CMAKE_CXX_OUTPUT_EXTENSION}") IF(EXTERNAL_OBJECT_BUILT) MESSAGE( - "Building ${EXTERNAL_OBJECT_NAME} succeeded with the following output:\n" + "Building external_object.cxx succeeded with the following output:\n" "[${OUTPUT}]" ) ELSE(EXTERNAL_OBJECT_BUILT) MESSAGE(FATAL_ERROR - "Building ${EXTERNAL_OBJECT_NAME} failed with the following output:\n" + "Building external_object.cxx failed with the following output:\n" "[${OUTPUT}]" ) ENDIF(EXTERNAL_OBJECT_BUILT) # Find the external object file. -SET(BASE ${ExternalOBJ_BINARY_DIR}/Object) -SET(EXTERNAL_OBJECT) -FOREACH(dir external.dir . ${CMAKE_CONFIGURATION_TYPES}) - IF(NOT EXTERNAL_OBJECT) - IF(EXISTS ${BASE}/${dir}/${EXTERNAL_OBJECT_NAME}) - SET(EXTERNAL_OBJECT ${BASE}/${dir}/${EXTERNAL_OBJECT_NAME}) - ENDIF(EXISTS ${BASE}/${dir}/${EXTERNAL_OBJECT_NAME}) - ENDIF(NOT EXTERNAL_OBJECT) -ENDFOREACH(dir) -IF(NOT EXTERNAL_OBJECT) - FILE(GLOB_RECURSE EXTERNAL_OBJECT - "${ExternalOBJ_BINARY_DIR}/Object/${EXTERNAL_OBJECT_NAME}") -ENDIF(NOT EXTERNAL_OBJECT) +SET(DIR ${ExternalOBJ_BINARY_DIR}/Object) +FILE(GLOB_RECURSE EXTERNAL_OBJECT + "${DIR}/external_object*${CMAKE_CXX_OUTPUT_EXTENSION}") IF(EXTERNAL_OBJECT) MESSAGE("Found \"${EXTERNAL_OBJECT}\".") ELSE(EXTERNAL_OBJECT) - MESSAGE(FATAL_ERROR "Could not find ${EXTERNAL_OBJECT_NAME}.") + MESSAGE(FATAL_ERROR "Could not find external object.") ENDIF(EXTERNAL_OBJECT) # Test creation of external objects by custom commands. |