[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.4 1.4.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/CPackComponents
In directory public:/mounts/ram/cvs-serv14310/Tests/CPackComponents

Modified Files:
      Tag: CMake-2-8
	CMakeLists.txt 
Log Message:
CMake 2.8.0-rc5


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CPackComponents/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** CMakeLists.txt	20 Jan 2009 19:29:41 -0000	1.4
--- CMakeLists.txt	3 Nov 2009 22:25:03 -0000	1.4.2.1
***************
*** 17,22 ****
  # On Linux, enable using an absolute install path to verify that
  # CMAKE_INSTALL_PREFIX and CPACK_SET_DESTDIR interact properly.
  if(UNIX AND NOT APPLE)
!   set(mylib_install_to_absolute_path ON)
  endif()
  
--- 17,30 ----
  # On Linux, enable using an absolute install path to verify that
  # CMAKE_INSTALL_PREFIX and CPACK_SET_DESTDIR interact properly.
+ #
+ # But only use absolute paths if not targeting an NSIS installer
+ # as indicated by CPACK_BINARY_NSIS. (If we allow this, the test
+ # fails on Linux machines with makensis installed when we are not
+ # cross-compiling...)
+ #
  if(UNIX AND NOT APPLE)
!   if(NOT CPACK_BINARY_NSIS)
!     set(mylib_install_to_absolute_path ON)
!   endif()
  endif()