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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Better recursive make in AddExternalProject

This teaches AddExternalProject to run "$(MAKE)" for build and install
steps of CMake-based external projects when using a Makefile generator.
It allows the external project to participate in a parallel make invoked
on the superproject.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExternalProject/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** CMakeLists.txt	24 Dec 2008 15:10:40 -0000	1.11
--- CMakeLists.txt	4 Mar 2009 16:45:42 -0000	1.12
***************
*** 119,123 ****
  add_external_project(${proj}
    TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
    INSTALL_COMMAND ""
  )
--- 119,124 ----
  add_external_project(${proj}
    TAR "${CMAKE_CURRENT_SOURCE_DIR}/Step1.tar"
!   CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
    INSTALL_COMMAND ""
  )
***************
*** 143,147 ****
  add_external_project(${proj}
    TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
    INSTALL_COMMAND ""
  )
--- 144,149 ----
  add_external_project(${proj}
    TGZ "${CMAKE_CURRENT_SOURCE_DIR}/Step1NoDir.tgz"
!   CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!   CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
    INSTALL_COMMAND ""
  )
***************
*** 168,172 ****
      CVS_MODULE "CMake/Tests/Tutorial/Step1"
      CVS_TAG "-D\;2008-12-01 01:00:00 UTC"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
    )
--- 170,175 ----
      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 ""
    )
***************
*** 179,183 ****
      CVS_MODULE "CMake/Source/kwsys"
      CVS_TAG "-r\;CMake-2-6-2"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
    )
--- 182,187 ----
      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 ""
    )
***************
*** 190,194 ****
        CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
        CVS_MODULE "KWStyle"
!       CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
        DEPENDS "EmptyNoOpProject"
        DEPENDS "TutorialStep1-LocalTAR"
--- 194,199 ----
        CVS_REPOSITORY ":pserver:anoncvs at public.kitware.com:/cvsroot/KWStyle"
        CVS_MODULE "KWStyle"
!       CMAKE_GENERATOR "${CMAKE_GENERATOR}"
!       CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\""
        DEPENDS "EmptyNoOpProject"
        DEPENDS "TutorialStep1-LocalTAR"
***************
*** 212,216 ****
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
      SVN_TAG "-r\;{2008-12-04 01:00:00 +0000}"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
    )
  
--- 217,222 ----
      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}\""
    )
  
***************
*** 221,225 ****
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
      SVN_TAG "-r\;4824"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
    )
--- 227,232 ----
      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 ""
    )
***************
*** 230,234 ****
    add_external_project(${proj}
      SVN_REPOSITORY "http://gdcm.svn.sourceforge.net/svnroot/gdcm/trunk/Utilities/gdcmmd5"
!     CONFIGURE_ARGS "\"-DCMAKE_INSTALL_PREFIX:PATH=${prefix}\" -G \"${CMAKE_GENERATOR}\" \"${source_dir}/${proj}\""
      INSTALL_COMMAND ""
    )
--- 237,242 ----
    add_external_project(${proj}
      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 ""
    )