Просмотр исходного кода

Tests: Teach CPackWiXGenerator to use WiX tools in PATH

Brad King 1 год назад
Родитель
Сommit
694f14f96f
1 измененных файлов с 2 добавлено и 3 удалено
  1. 2 3
      Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake

+ 2 - 3
Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake

@@ -39,9 +39,8 @@ endif()
 
 function(run_wix_command command)
   file(TO_CMAKE_PATH "$ENV{WIX}" WIX_ROOT)
-  set(WIX_PROGRAM "${WIX_ROOT}/bin/${command}.exe")
-
-  if(NOT EXISTS "${WIX_PROGRAM}")
+  find_program(WIX_PROGRAM NAMES ${command} NO_CACHE PATHS "${WIX_ROOT}" PATH_SUFFIXES "bin")
+  if(NOT WIX_PROGRAM)
     message(FATAL_ERROR "Failed to find WiX Tool: ${WIX_PROGRAM}")
   endif()