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

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeLists.txt 
Log Message:
Clean up CMake build tree 'bin' directory

We re-arrange EXECUTABLE_OUTPUT_PATH settings to avoid putting utility
and test executables in the 'bin' directory of the build tree.  This
makes the directory look like that in the installation tree, except that
on multi-configuration generators we still use a per-config
subdirectory.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.167
retrieving revision 1.168
diff -C 2 -d -r1.167 -r1.168
*** CMakeLists.txt	8 Dec 2009 16:27:36 -0000	1.167
--- CMakeLists.txt	8 Dec 2009 16:44:28 -0000	1.168
***************
*** 21,24 ****
--- 21,26 ----
  SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
  
+ SET(CMake_BIN_DIR ${CMake_BINARY_DIR}/bin)
+ 
  IF(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
    # Since the built CMake will install itself instead of the
***************
*** 135,141 ****
      # and not the ctest from the cmake building and testing
      # cmake.
!     SET(CMAKE_CTEST_COMMAND "${EXECUTABLE_OUTPUT_PATH}/ctest")
!     SET(CMAKE_CMAKE_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cmake")
!     SET(CMAKE_CPACK_COMMAND "${EXECUTABLE_OUTPUT_PATH}/cpack")
    ENDIF(BUILD_TESTING)
  
--- 137,143 ----
      # and not the ctest from the cmake building and testing
      # cmake.
!     SET(CMAKE_CTEST_COMMAND "${CMake_BIN_DIR}/ctest")
!     SET(CMAKE_CMAKE_COMMAND "${CMake_BIN_DIR}/cmake")
!     SET(CMAKE_CPACK_COMMAND "${CMake_BIN_DIR}/cpack")
    ENDIF(BUILD_TESTING)
  
***************
*** 343,348 ****
  # where to write the resulting executables and libraries
  SET(BUILD_SHARED_LIBS OFF)
! SET(EXECUTABLE_OUTPUT_PATH ${CMake_BINARY_DIR}/bin CACHE INTERNAL 
!   "Where to put the executables for CMake")
  SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL 
    "Where to put the libraries for CMake")
--- 345,349 ----
  # where to write the resulting executables and libraries
  SET(BUILD_SHARED_LIBS OFF)
! SET(EXECUTABLE_OUTPUT_PATH "" CACHE INTERNAL "No configurable exe dir.")
  SET(LIBRARY_OUTPUT_PATH "" CACHE INTERNAL 
    "Where to put the libraries for CMake")