瀏覽代碼

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 年之前
父節點
當前提交
edaa6d3a97
共有 1 個文件被更改,包括 2 次插入2 次删除
  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)