[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.102 1.103

cmake-commits at cmake.org cmake-commits at cmake.org
Fri May 1 09:45:46 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/SimpleInstall
In directory public:/mounts/ram/cvs-serv28504/Tests/SimpleInstall

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Allow more specification of target file names

This creates target properties ARCHIVE_OUTPUT_NAME, LIBRARY_OUTPUT_NAME,
and RUNTIME_OUTPUT_NAME, and per-configuration equivalent properties
ARCHIVE_OUTPUT_NAME_<CONFIG>, LIBRARY_OUTPUT_NAME_<CONFIG>, and
RUNTIME_OUTPUT_NAME_<CONFIG>.  They allow specification of target output
file names on a per-type, per-configuration basis.  For example, a .dll
and its .lib import library may have different base names.

For consistency and to avoid ambiguity, the old <CONFIG>_OUTPUT_NAME
property is now also available as OUTPUT_NAME_<CONFIG>.

See issue #8920.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.102
retrieving revision 1.103
diff -C 2 -d -r1.102 -r1.103
*** CMakeLists.txt	24 Feb 2009 16:41:40 -0000	1.102
--- CMakeLists.txt	1 May 2009 13:45:43 -0000	1.103
***************
*** 34,38 ****
    SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX} test1rel)
    SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX})
!   SET(t4NAMES test4 test4${CMAKE_DEBUG_POSTFIX})
  
    # Make sure the install script ran.
--- 34,38 ----
    SET(t1NAMES test1 test1${CMAKE_DEBUG_POSTFIX} test1rel)
    SET(t2NAMES test2 test2${CMAKE_DEBUG_POSTFIX})
!   SET(t4NAMES test4out test4out${CMAKE_DEBUG_POSTFIX})
  
    # Make sure the install script ran.
***************
*** 166,169 ****
--- 166,173 ----
    ADD_LIBRARY(test4 SHARED lib4.cxx)
  
+   # Test <ARCHIVE|LIBRARY|RUNTIME>_OUTPUT_NAME properties.
+   SET_PROPERTY(TARGET test4 PROPERTY ARCHIVE_OUTPUT_NAME test4out)
+   SET_PROPERTY(TARGET test4 PROPERTY LIBRARY_OUTPUT_NAME test4out)
+ 
    ADD_EXECUTABLE (SimpleInstall inst.cxx foo.c foo.h)
    TARGET_LINK_LIBRARIES(SimpleInstall test1 test2 test4)



More information about the Cmake-commits mailing list