[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.140 1.141

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
BUG: Enforce KWSys component dependencies early

KWSys component dependencies must be enforced before any tests for
enabled components are done.  This moves the dependency enforcement code
to be as early as possible.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/CMakeLists.txt,v
retrieving revision 1.140
retrieving revision 1.141
diff -C 2 -d -r1.140 -r1.141
*** CMakeLists.txt	26 Sep 2008 12:24:31 -0000	1.140
--- CMakeLists.txt	17 Oct 2008 16:51:57 -0000	1.141
***************
*** 155,159 ****
    SET(KWSYS_USE_CPU 1)
  ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
!   
  # Setup the large file support default.
  IF(KWSYS_LFS_DISABLE)
--- 155,172 ----
    SET(KWSYS_USE_CPU 1)
  ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
! 
! # Enforce component dependencies.
! IF(KWSYS_USE_SystemTools)
!   SET(KWSYS_USE_Directory 1)
! ENDIF(KWSYS_USE_SystemTools)
! IF(KWSYS_USE_Glob)
!   SET(KWSYS_USE_Directory 1)
!   SET(KWSYS_USE_SystemTools 1)
!   SET(KWSYS_USE_RegularExpression 1)
! ENDIF(KWSYS_USE_Glob)
! IF(KWSYS_USE_Process)
!   SET(KWSYS_USE_System 1)
! ENDIF(KWSYS_USE_Process)
! 
  # Setup the large file support default.
  IF(KWSYS_LFS_DISABLE)
***************
*** 636,652 ****
    )
  
- # Enforce component dependencies.
- IF(KWSYS_USE_SystemTools)
-   SET(KWSYS_USE_Directory 1)
- ENDIF(KWSYS_USE_SystemTools)
- IF(KWSYS_USE_Glob)
-   SET(KWSYS_USE_Directory 1)
-   SET(KWSYS_USE_SystemTools 1)
-   SET(KWSYS_USE_RegularExpression 1)
- ENDIF(KWSYS_USE_Glob)
- IF(KWSYS_USE_Process)
-   SET(KWSYS_USE_System 1)
- ENDIF(KWSYS_USE_Process)
- 
  # Add selected C++ classes.
  SET(cppclasses
--- 649,652 ----