[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.12 1.13

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Mar 18 11:00:34 EDT 2009


Update of /cvsroot/CMake/CMake/Tests/ExternalProject
In directory public:/mounts/ram/cvs-serv14822/Tests/ExternalProject

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Improve add_external_project interface

This rewrites the keyword/argument parsing and handling in the
AddExternalProject module to use arguments more literally:

  - The strict keyword-value pairing is gone in favor of keywords with
    arbitrary non-keyword values.  This avoids requiring users to escape
    spaces and quotes in command lines.

  - Customized step command lines are now specified with a single
    keyword <step>_COMMAND instead of putting the arguments in a
    separate entry (previously called <step>_ARGS).

  - Build step custom commands now use VERBATIM mode so that arguments
    are correctly escaped on the command line during builds.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** CMakeLists.txt	4 Mar 2009 16:45:42 -0000	1.12
--- CMakeLists.txt	18 Mar 2009 15:00:30 -0000	1.13
***************
*** 80,84 ****
    BUILD_ARGS ""
    BUILD_COMMAND ""
!   CONFIGURE_ARGS ""
    CONFIGURE_COMMAND ""
    CONFIGURE_DIR ""
--- 80,84 ----
    BUILD_ARGS ""
    BUILD_COMMAND ""
!   CMAKE_ARGS ""
    CONFIGURE_COMMAND ""
    CONFIGURE_DIR ""
***************
*** 88,92 ****
    DEPENDS "MinimalNoOpProject"
    DIR ""
-   DOWNLOAD_ARGS ""
    DOWNLOAD_COMMAND ""
    INSTALL_ARGS ""
--- 88,91 ----
***************
*** 98,102 ****
    TGZ ""
    TGZ_URL ""
-   UPDATE_ARGS ""
    UPDATE_COMMAND ""
  )
--- 97,100 ----
***************
*** 109,113 ****
    add_external_project(${proj}
      DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
    )
  endif()
--- 107,111 ----
    add_external_project(${proj}
      DIR "${CMAKE_CURRENT_SOURCE_DIR}/../Tutorial/Step5"
!     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -G ${CMAKE_GENERATOR} ${source_dir}/${proj}
    )
  endif()
***************
*** 120,124 ****
    TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
    INSTALL_COMMAND ""
  )
--- 118,122 ----
    TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
    INSTALL_COMMAND ""
  )
***************
*** 127,131 ****
  add_external_project(${proj}
    TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
    INSTALL_COMMAND ""
  )
--- 125,129 ----
  add_external_project(${proj}
    TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tar"
!   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -G ${CMAKE_GENERATOR} ${source_dir}/${proj}
    INSTALL_COMMAND ""
  )
***************
*** 137,141 ****
  add_external_project(${proj}
    TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
    INSTALL_COMMAND ""
  )
--- 135,139 ----
  add_external_project(${proj}
    TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tgz"
!   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -G ${CMAKE_GENERATOR} ${source_dir}/${proj}
    INSTALL_COMMAND ""
  )
***************
*** 145,149 ****
    TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
    INSTALL_COMMAND ""
  )
--- 143,147 ----
    TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
    INSTALL_COMMAND ""
  )
***************
*** 169,175 ****
      CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
      CVS_MODULE "CMake/Tests/Tutorial/Step1"
!     CVS_TAG "-D\;2008-12-01 01:00:00 UTC"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
      INSTALL_COMMAND ""
    )
--- 167,173 ----
      CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
      CVS_MODULE "CMake/Tests/Tutorial/Step1"
!     CVS_TAG "-D2008-12-01 01:00:00 UTC"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
      INSTALL_COMMAND ""
    )
***************
*** 181,187 ****
      CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
      CVS_MODULE "CMake/Source/kwsys"
!     CVS_TAG "-r\;CMake-2-6-2"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
      INSTALL_COMMAND ""
    )
--- 179,185 ----
      CVS_REPOSITORY ":pserver:anonymous:cmake at www.cmake.org:/cvsroot/CMake"
      CVS_MODULE "CMake/Source/kwsys"
!     CVS_TAG -rCMake-2-6-2
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
      INSTALL_COMMAND ""
    )
***************
*** 195,199 ****
        CVS_MODULE "KWStyle"
        CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!       CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
        DEPENDS "EmptyNoOpProject"
        DEPENDS "TutorialStep1-LocalTAR"
--- 193,197 ----
        CVS_MODULE "KWStyle"
        CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!       CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
        DEPENDS "EmptyNoOpProject"
        DEPENDS "TutorialStep1-LocalTAR"
***************
*** 216,222 ****
    add_external_project(${proj}
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
!     SVN_TAG "-r\;{2008-12-04 01:00:00 +0000}"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
    )
  
--- 214,220 ----
    add_external_project(${proj}
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
!     SVN_TAG "-r{2008-12-04 01:00:00 +0000}"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
    )
  
***************
*** 226,232 ****
    add_external_project(${proj}
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
!     SVN_TAG "-r\;4824"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
      INSTALL_COMMAND ""
    )
--- 224,230 ----
    add_external_project(${proj}
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
!     SVN_TAG "-r4824"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
      INSTALL_COMMAND ""
    )
***************
*** 238,242 ****
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
      INSTALL_COMMAND ""
    )
--- 236,240 ----
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
      CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
      INSTALL_COMMAND ""
    )



More information about the Cmake-commits mailing list