Revision: 77039
http://sourceforge.net/p/brlcad/code/77039
Author: starseeker
Date: 2020-09-03 17:22:47 +0000 (Thu, 03 Sep 2020)
Log Message:
-----------
Adjust path hunting for WiX
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindWix.cmake
Modified: brlcad/trunk/misc/CMake/FindWix.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindWix.cmake 2020-09-03 17:09:04 UTC (rev
77038)
+++ brlcad/trunk/misc/CMake/FindWix.cmake 2020-09-03 17:22:47 UTC (rev
77039)
@@ -19,10 +19,14 @@
# Get path, convert backslashes as ${ENV_${var}}
getenv_path(WIX_HOME)
+# Find version specific paths
+file(GLOB WIX_PATHS LIST_DIRECTORIES TRUE "C:/Program Files*/WiX Toolset*")
+
+message("WIX_PATHS: ${WIX_PATHS}")
+
# construct search paths
-set(WIX_PREFIX_PATH ${WIX_HOME} ${ENV_WIX_HOME}
- "C:/Program Files/Windows Installer XML Toolset 3.0"
-)
+set(WIX_PREFIX_PATH ${WIX_HOME} ${ENV_WIX_HOME} ${WIX_PATHS})
+
find_path(Wix_BINARY_DIR NAMES candle.exe HINTS ${WIX_PREFIX_PATH}
PATH_SUFFIXES bin)
if(Wix_BINARY_DIR)
@@ -29,4 +33,4 @@
set (Wix_FOUND TRUE)
endif()
-mark_as_advanced(Wix_BINARY_DIR Wix_FOUND)
\ No newline at end of file
+mark_as_advanced(Wix_BINARY_DIR Wix_FOUND)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
