[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.43 1.44

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/Complex/Library
In directory public:/mounts/ram/cvs-serv31875/Tests/Complex/Library

Modified Files:
	CMakeLists.txt 
Log Message:
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.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Library/CMakeLists.txt,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** CMakeLists.txt	20 Aug 2008 15:45:16 -0000	1.43
--- CMakeLists.txt	1 May 2009 14:38:35 -0000	1.44
***************
*** 67,71 ****
    ADD_LIBRARY(CMakeTestLinkShared SHARED TestLink.c)
    SET_TARGET_PROPERTIES(CMakeTestLinkStatic CMakeTestLinkShared
!     PROPERTIES OUTPUT_NAME CMakeTestLink CLEAN_DIRECT_OUTPUT 1)
  ENDIF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS)
  
--- 67,71 ----
    ADD_LIBRARY(CMakeTestLinkShared SHARED TestLink.c)
    SET_TARGET_PROPERTIES(CMakeTestLinkStatic CMakeTestLinkShared
!     PROPERTIES OUTPUT_NAME CMakeTestLink)
  ENDIF(CMAKE_EXE_LINK_STATIC_CXX_FLAGS)