From edaa6d3a97b06bf42e772d45e2e34535302a5f89 Mon Sep 17 00:00:00 2001 From: David Cole Date: Wed, 18 Jun 2008 09:28:51 -0400 Subject: [PATCH] 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...) --- Tests/CPackComponents/VerifyResult.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/CPackComponents/VerifyResult.cmake b/Tests/CPackComponents/VerifyResult.cmake index 3e64a46d2..850ec0022 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)