diff options
| author | Brad King <brad.king@kitware.com> | 2009-05-01 14:38:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-05-01 14:38:35 (GMT) |
| commit | 430cc2b4b7a817be2fbc445d6803163f1695a533 (patch) | |
| tree | f41fc7fbf2fb1671bb0fa3b9e36bc6ecc5403957 /Tests | |
| parent | 2740db5eded92d61ae38e69d67a4e4179ae5d20e (diff) | |
| download | CMake-430cc2b4b7a817be2fbc445d6803163f1695a533.zip CMake-430cc2b4b7a817be2fbc445d6803163f1695a533.tar.gz CMake-430cc2b4b7a817be2fbc445d6803163f1695a533.tar.bz2 | |
ENH: Always imply CLEAN_DIRECT_OUTPUT target prop
This property was left from before CMake always linked using full path
library names for targets it builds. In order to safely link with
"-lfoo" we needed to avoid having both shared and static libraries in
the build tree for targets that switch on BUILD_SHARED_LIBS. This meant
cleaning both shared and static names before creating the library, which
led to the creation of CLEAN_DIRECT_OUTPUT to disable the behavior.
Now that we always link with a full path we do not need to clean old
library names left from an alternate setting of BUILD_SHARED_LIBS. This
change removes the CLEAN_DIRECT_OUTPUT property and instead uses its
behavior always. It removes some complexity from cmTarget internally.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Complex/Library/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexOneConfig/Library/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/ComplexRelativePaths/Library/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt index 4f2e5a4..d21e959 100644 --- a/Tests/Complex/Library/CMakeLists.txt +++ b/Tests/Complex/Library/CMakeLists.txt @@ -66,7 +66,7 @@ IF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS) ADD_LIBRARY(CMakeTestLinkStatic STATIC TestLink.c) ADD_LIBRARY(CMakeTestLinkShared SHARED TestLink.c) SET_TARGET_PROPERTIES(CMakeTestLinkStatic CMakeTestLinkShared - PROPERTIES OUTPUT_NAME CMakeTestLink CLEAN_DIRECT_OUTPUT 1) + PROPERTIES OUTPUT_NAME CMakeTestLink) ENDIF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS) # diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt index 4f2e5a4..d21e959 100644 --- a/Tests/ComplexOneConfig/Library/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt @@ -66,7 +66,7 @@ IF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS) ADD_LIBRARY(CMakeTestLinkStatic STATIC TestLink.c) ADD_LIBRARY(CMakeTestLinkShared SHARED TestLink.c) SET_TARGET_PROPERTIES(CMakeTestLinkStatic CMakeTestLinkShared - PROPERTIES OUTPUT_NAME CMakeTestLink CLEAN_DIRECT_OUTPUT 1) + PROPERTIES OUTPUT_NAME CMakeTestLink) ENDIF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS) # diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt index 4f2e5a4..d21e959 100644 --- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt +++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt @@ -66,7 +66,7 @@ IF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS) ADD_LIBRARY(CMakeTestLinkStatic STATIC TestLink.c) ADD_LIBRARY(CMakeTestLinkShared SHARED TestLink.c) SET_TARGET_PROPERTIES(CMakeTestLinkStatic CMakeTestLinkShared - PROPERTIES OUTPUT_NAME CMakeTestLink CLEAN_DIRECT_OUTPUT 1) + PROPERTIES OUTPUT_NAME CMakeTestLink) ENDIF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS) # |