[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.143 1.144

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Feb 13 15:49:54 EST 2009


Update of /cvsroot/CMake/CMake/Source/kwsys
In directory public:/mounts/ram/cvs-serv9240/Source/kwsys

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Optionally label KWSys targets and tests

This provides an API for parent projects to use to specify values to be
set in the LABELS properties of KWSys libraries, executables, and tests.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.143
retrieving revision 1.144
diff -C 2 -d -r1.143 -r1.144
*** CMakeLists.txt	13 Feb 2009 20:49:47 -0000	1.143
--- CMakeLists.txt	13 Feb 2009 20:49:52 -0000	1.144
***************
*** 123,126 ****
--- 123,136 ----
  PROJECT(${KWSYS_NAMESPACE})
  
+ # Some properties we set only with CMake 2.6 and above.
+ IF(COMMAND SET_PROPERTY)
+   MACRO(KWSYS_SET_PROPERTY)
+     SET_PROPERTY(${ARGV})
+   ENDMACRO(KWSYS_SET_PROPERTY)
+ ELSE(COMMAND SET_PROPERTY)
+   MACRO(KWSYS_SET_PROPERTY)
+   ENDMACRO(KWSYS_SET_PROPERTY)
+ ENDIF(COMMAND SET_PROPERTY)
+ 
  # Tell CMake how to follow dependencies of sources in this directory.
  IF(COMMAND SET_PROPERTY)
***************
*** 787,790 ****
--- 797,801 ----
    ADD_LIBRARY(${KWSYS_NAMESPACE} ${KWSYS_LIBRARY_TYPE}
      ${KWSYS_C_SRCS} ${KWSYS_CXX_SRCS})
+   KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE} PROPERTY LABELS ${KWSYS_LABELS_LIB})
    IF(KWSYS_USE_DynamicLoader)
      IF(UNIX)
***************
*** 816,819 ****
--- 827,831 ----
  IF(KWSYS_ENABLE_C AND KWSYS_C_SRCS)
    ADD_LIBRARY(${KWSYS_NAMESPACE}_c ${KWSYS_LIBRARY_TYPE} ${KWSYS_C_SRCS})
+   KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}_c PROPERTY LABELS ${KWSYS_LABELS_LIB})
  
    # Apply user-defined target properties to the library.
***************
*** 848,851 ****
--- 860,865 ----
      ADD_EXECUTABLE(${KWSYS_NAMESPACE}ProcessFwd9x ProcessFwd9x.c)
      ADD_EXECUTABLE(${KWSYS_NAMESPACE}EncodeExecutable EncodeExecutable.c)
+     KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}ProcessFwd9x PROPERTY LABELS ${KWSYS_LABELS_EXE})
+     KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}EncodeExecutable PROPERTY LABELS ${KWSYS_LABELS_EXE})
  
      # Construct the location of the executable to be encoded.
***************
*** 910,916 ****
--- 924,932 ----
        )
      ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestsC ${KWSYS_C_TEST_SRCS})
+     KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestsC PROPERTY LABELS ${KWSYS_LABELS_EXE})
      TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE}TestsC ${KWSYS_NAMESPACE}_c)
      FOREACH(test ${KWSYS_C_TESTS})
        ADD_TEST(kwsys.${test} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestsC ${test} ${KWSYS_TEST_ARGS_${test}})
+       KWSYS_SET_PROPERTY(TEST kwsys.${test} PROPERTY LABELS ${KWSYS_LABELS_TEST})
      ENDFOREACH(test)
  
***************
*** 936,939 ****
--- 952,956 ----
        # If kwsys contains the DynamicLoader, need extra library
        ADD_LIBRARY(${KWSYS_NAMESPACE}TestDynload MODULE testDynload.c)
+       KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestDynload PROPERTY LABELS ${KWSYS_LABELS_LIB})
      ENDIF(KWSYS_USE_DynamicLoader)
      CREATE_TEST_SOURCELIST(
***************
*** 942,945 ****
--- 959,963 ----
        )
      ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_CXX_TEST_SRCS})
+     KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestsCxx PROPERTY LABELS ${KWSYS_LABELS_EXE})
      TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE}TestsCxx ${KWSYS_NAMESPACE})
      SET(TEST_SYSTEMTOOLS_BIN_FILE
***************
*** 988,995 ****
--- 1006,1015 ----
      FOREACH(test ${KWSYS_CXX_TESTS})
        ADD_TEST(kwsys.${test} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestsCxx ${test} ${KWSYS_TEST_ARGS_${test}})
+       KWSYS_SET_PROPERTY(TEST kwsys.${test} PROPERTY LABELS ${KWSYS_LABELS_TEST})
      ENDFOREACH(test)
  
      # Process tests.
      ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestProcess testProcess.c)
+     KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestProcess PROPERTY LABELS ${KWSYS_LABELS_EXE})
      TARGET_LINK_LIBRARIES(${KWSYS_NAMESPACE}TestProcess ${KWSYS_NAMESPACE}_c)
      IF(NOT CYGWIN)
***************
*** 998,1001 ****
--- 1018,1022 ----
      FOREACH(n 1 2 3 4 5 6 ${KWSYS_TEST_PROCESS_7})
        ADD_TEST(kwsys.testProcess-${n} ${EXEC_DIR}/${KWSYS_NAMESPACE}TestProcess ${n})
+       KWSYS_SET_PROPERTY(TEST kwsys.testProcess-${n} PROPERTY LABELS ${KWSYS_LABELS_TEST})
      ENDFOREACH(n)
  
***************
*** 1005,1009 ****
--- 1026,1032 ----
      ADD_EXECUTABLE(${KWSYS_NAMESPACE}TestSharedForward
                     ${PROJECT_BINARY_DIR}/testSharedForward.c)
+     KWSYS_SET_PROPERTY(TARGET ${KWSYS_NAMESPACE}TestSharedForward PROPERTY LABELS ${KWSYS_LABELS_EXE})
      ADD_TEST(kwsys.testSharedForward ${EXEC_DIR}/${KWSYS_NAMESPACE}TestSharedForward 1)
+     KWSYS_SET_PROPERTY(TEST kwsys.testSharedForward PROPERTY LABELS ${KWSYS_LABELS_TEST})
  
      # Configure some test properties.



More information about the Cmake-commits mailing list