[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.168 1.169

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv19620

Modified Files:
	CMakeLists.txt 
Log Message:
Use add_subdirectory instead of subdirs in CMake

We switch CMake's own top-level CMakeLists.txt file to use the modern
add_subdirectory() command instead of the old subdirs() command.  This
enables in-order processing.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.168
retrieving revision 1.169
diff -C 2 -d -r1.168 -r1.169
*** CMakeLists.txt	8 Dec 2009 16:44:28 -0000	1.168
--- CMakeLists.txt	10 Dec 2009 14:10:01 -0000	1.169
***************
*** 181,185 ****
    SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
    SET(KWSYS_INSTALL_DOC_DIR "${CMake_DOC_DEST}")
!   SUBDIRS(Source/kwsys)
    
    #---------------------------------------------------------------------
--- 181,185 ----
    SET(KWSYS_HEADER_ROOT ${CMake_BINARY_DIR}/Source)
    SET(KWSYS_INSTALL_DOC_DIR "${CMake_DOC_DEST}")
!   ADD_SUBDIRECTORY(Source/kwsys)
    
    #---------------------------------------------------------------------
***************
*** 210,214 ****
      SET(CMAKE_ZLIB_INCLUDES)
      SET(CMAKE_ZLIB_LIBRARIES cmzlib)
!     SUBDIRS(Utilities/cmzlib)
    ENDIF(CMAKE_USE_SYSTEM_ZLIB)
    
--- 210,214 ----
      SET(CMAKE_ZLIB_INCLUDES)
      SET(CMAKE_ZLIB_LIBRARIES cmzlib)
!     ADD_SUBDIRECTORY(Utilities/cmzlib)
    ENDIF(CMAKE_USE_SYSTEM_ZLIB)
    
***************
*** 233,237 ****
      SET(CMAKE_CURL_INCLUDES)
      SET(CMAKE_CURL_LIBRARIES cmcurl)
!     SUBDIRS(Utilities/cmcurl)
    ENDIF(CMAKE_USE_SYSTEM_CURL)
  
--- 233,237 ----
      SET(CMAKE_CURL_INCLUDES)
      SET(CMAKE_CURL_LIBRARIES cmcurl)
!     ADD_SUBDIRECTORY(Utilities/cmcurl)
    ENDIF(CMAKE_USE_SYSTEM_CURL)
  
***************
*** 241,245 ****
      "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
    SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
!   SUBDIRS(Utilities/cmcompress)
    IF(CMAKE_USE_SYSTEM_BZIP2)
      FIND_PACKAGE(BZip2)
--- 241,245 ----
      "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmcompress")
    SET(CMAKE_COMPRESS_LIBRARIES "cmcompress")
!   ADD_SUBDIRECTORY(Utilities/cmcompress)
    IF(CMAKE_USE_SYSTEM_BZIP2)
      FIND_PACKAGE(BZip2)
***************
*** 248,252 ****
        "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
      SET(BZIP2_LIBRARIES cmbzip2)
!     SUBDIRS(Utilities/cmbzip2)
    ENDIF()
    IF(CMAKE_USE_SYSTEM_LIBARCHIVE)
--- 248,252 ----
        "${CMAKE_CURRENT_SOURCE_DIR}/Utilities/cmbzip2")
      SET(BZIP2_LIBRARIES cmbzip2)
!     ADD_SUBDIRECTORY(Utilities/cmbzip2)
    ENDIF()
    IF(CMAKE_USE_SYSTEM_LIBARCHIVE)
***************
*** 260,264 ****
      SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
      ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
!     SUBDIRS(Utilities/cmlibarchive)
      SET(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})
    ENDIF(CMAKE_USE_SYSTEM_LIBARCHIVE)
--- 260,264 ----
      SET(BUILD_ARCHIVE_WITHIN_CMAKE TRUE)
      ADD_DEFINITIONS(-DLIBARCHIVE_STATIC)
!     ADD_SUBDIRECTORY(Utilities/cmlibarchive)
      SET(CMAKE_TAR_LIBRARIES cmlibarchive ${BZIP2_LIBRARIES})
    ENDIF(CMAKE_USE_SYSTEM_LIBARCHIVE)
***************
*** 277,281 ****
      SET(CMAKE_EXPAT_INCLUDES)
      SET(CMAKE_EXPAT_LIBRARIES cmexpat)
!     SUBDIRS(Utilities/cmexpat)
    ENDIF(CMAKE_USE_SYSTEM_EXPAT)
    
--- 277,281 ----
      SET(CMAKE_EXPAT_INCLUDES)
      SET(CMAKE_EXPAT_LIBRARIES cmexpat)
!     ADD_SUBDIRECTORY(Utilities/cmexpat)
    ENDIF(CMAKE_USE_SYSTEM_EXPAT)
    
***************
*** 312,316 ****
    ENDIF (UNIX)
    IF(BUILD_CursesDialog)
!     SUBDIRS(Source/CursesDialog/form)
    ENDIF(BUILD_CursesDialog)
  ENDMACRO (CMAKE_BUILD_UTILITIES)
--- 312,316 ----
    ENDIF (UNIX)
    IF(BUILD_CursesDialog)
!     ADD_SUBDIRECTORY(Source/CursesDialog/form)
    ENDIF(BUILD_CursesDialog)
  ENDMACRO (CMAKE_BUILD_UTILITIES)
***************
*** 449,455 ****
  
  # build the remaining subdirectories
! SUBDIRS(Source)
! SUBDIRS(Utilities)
! SUBDIRS(Tests)
  
  # add a test
--- 449,455 ----
  
  # build the remaining subdirectories
! ADD_SUBDIRECTORY(Source)
! ADD_SUBDIRECTORY(Utilities)
! ADD_SUBDIRECTORY(Tests)
  
  # add a test