diff options
| author | David Cole <david.cole@kitware.com> | 2008-06-18 13:28:51 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2008-06-18 13:28:51 (GMT) |
| commit | edaa6d3a97b06bf42e772d45e2e34535302a5f89 (patch) | |
| tree | b4497f413f1b58de1c8f7aa659c4857d30443c27 | |
| parent | a2e5cb25e7066eb6c39c627793bdb5b213c0d004 (diff) | |
| download | CMake-edaa6d3a97b06bf42e772d45e2e34535302a5f89.zip CMake-edaa6d3a97b06bf42e772d45e2e34535302a5f89.tar.gz CMake-edaa6d3a97b06bf42e772d45e2e34535302a5f89.tar.bz2 | |
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...)
| -rw-r--r-- | Tests/CPackComponents/VerifyResult.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CPackComponents/VerifyResult.cmake b/Tests/CPackComponents/VerifyResult.cmake index 3e64a46..850ec00 100644 --- a/Tests/CPackComponents/VerifyResult.cmake +++ b/Tests/CPackComponents/VerifyResult.cmake @@ -17,7 +17,7 @@ if(WIN32) DOC "makensis.exe location" ) 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(WIN32) @@ -25,7 +25,7 @@ if(APPLE) # Always expect the *.dmg installer - PackageMaker should always # 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) if(expected_file_mask) |