diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-19 23:07:40 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-03-24 18:43:11 (GMT) |
| commit | e7f5ad8df2f8dda35fea51b7c01f068497c16940 (patch) | |
| tree | 8d48e022442cfee134534ecb6139c88d94a10980 | |
| parent | 729d904050830f62c40cd4076c36e3149a69d29d (diff) | |
| download | CMake-e7f5ad8df2f8dda35fea51b7c01f068497c16940.zip CMake-e7f5ad8df2f8dda35fea51b7c01f068497c16940.tar.gz CMake-e7f5ad8df2f8dda35fea51b7c01f068497c16940.tar.bz2 | |
Tests: Prepare RunCMake.CPack_WIX to cover multiple WiX versions
| -rw-r--r-- | Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake (renamed from Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt (renamed from Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt) | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt (renamed from Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt) | 0 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake | 13 |
4 files changed, 12 insertions, 3 deletions
diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake index a7a28ae..a7a28ae 100644 --- a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake +++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt index 110b36e..2998440 100644 --- a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt +++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt @@ -8,4 +8,4 @@ CPack: - Install component: headers CPack: - Install component: libraries CPack: Create package CPack: - package: [^ -]*/Tests/RunCMake/CPack_WIX/AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\. +]*/Tests/RunCMake/CPack_WIX/3-AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\. diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt b/Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt index 4713447..4713447 100644 --- a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt +++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt diff --git a/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake b/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake index cd525d0..cf14d7d 100644 --- a/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake @@ -1,7 +1,16 @@ include(RunCPack) +set(env_PATH "$ENV{PATH}") + set(RunCPack_GENERATORS WIX) +set(RunCPack_GLOB *.msi) +set(RunCPack_VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1) -set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};$ENV{PATH}") +function(run_cpack_wix v) + run_cpack(${v}-AppWiX SAMPLE AppWiX BUILD) +endfunction() -run_cpack(AppWiX BUILD GLOB *.msi VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1) +if(CMake_TEST_CPACK_WIX3) + set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};${env_PATH}") + run_cpack_wix(3) +endif() |