[Cmake-commits] [cmake-commits] david.cole committed VerifyResult.cmake 1.1 1.2

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jun 18 09:28:53 EDT 2008


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

Modified Files:
	VerifyResult.cmake 
Log Message:
BUG: Be more specific about the expected file name of the installer. (So we don't get mylibapp.exe in our GLOB results in make based build trees where the built exes end up in the same directory as the CPack installers...)


Index: VerifyResult.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CPackComponents/VerifyResult.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** VerifyResult.cmake	17 Jun 2008 15:39:26 -0000	1.1
--- VerifyResult.cmake	18 Jun 2008 13:28:51 -0000	1.2
***************
*** 18,22 ****
      )
    if(NSIS_MAKENSIS_EXECUTABLE)
!     set(expected_file_mask "${CPackComponents_BINARY_DIR}/*.exe")
    endif(NSIS_MAKENSIS_EXECUTABLE)
  endif(WIN32)
--- 18,22 ----
      )
    if(NSIS_MAKENSIS_EXECUTABLE)
!     set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.exe")
    endif(NSIS_MAKENSIS_EXECUTABLE)
  endif(WIN32)
***************
*** 26,30 ****
    # be installed on a development Mac:
    #
!   set(expected_file_mask "${CPackComponents_BINARY_DIR}/*.dmg")
  endif(APPLE)
  
--- 26,30 ----
    # be installed on a development Mac:
    #
!   set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.dmg")
  endif(APPLE)
  



More information about the Cmake-commits mailing list