Browse Source

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...)

David Cole 17 years ago
parent
commit
edaa6d3a97
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Tests/CPackComponents/VerifyResult.cmake

+ 2 - 2
Tests/CPackComponents/VerifyResult.cmake

@@ -17,7 +17,7 @@ if(WIN32)
     DOC "makensis.exe location"
     DOC "makensis.exe location"
     )
     )
   if(NSIS_MAKENSIS_EXECUTABLE)
   if(NSIS_MAKENSIS_EXECUTABLE)
-    set(expected_file_mask "${CPackComponents_BINARY_DIR}/*.exe")
+    set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.exe")
   endif(NSIS_MAKENSIS_EXECUTABLE)
   endif(NSIS_MAKENSIS_EXECUTABLE)
 endif(WIN32)
 endif(WIN32)
 
 
@@ -25,7 +25,7 @@ if(APPLE)
   # Always expect the *.dmg installer - PackageMaker should always
   # Always expect the *.dmg installer - PackageMaker should always
   # be installed on a development Mac:
   # be installed on a development Mac:
   #
   #
-  set(expected_file_mask "${CPackComponents_BINARY_DIR}/*.dmg")
+  set(expected_file_mask "${CPackComponents_BINARY_DIR}/MyLib-*.dmg")
 endif(APPLE)
 endif(APPLE)
 
 
 if(expected_file_mask)
 if(expected_file_mask)