diff --git a/xo-cmake/bin/xo-build.in b/xo-cmake/bin/xo-build.in index 6a450de0..4399932a 100644 --- a/xo-cmake/bin/xo-build.in +++ b/xo-cmake/bin/xo-build.in @@ -127,6 +127,7 @@ repo() { xoname=$1 case "$xoname" in + # carve-outs for 4 snowflake xo repo names xo-indentlog) echo "${XO_REPO_STEM}/indentlog.git" ;; @@ -189,7 +190,7 @@ fi if [[ $configure_flag -eq 1 ]]; then if [[ -n "$xoname" ]]; then - cmd="cmake -DCMAKE_INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@ -S $pathtosource -B $pathtobuild" + cmd="cmake -DCMAKE_INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@ -DCMAKE_MODULE_PATH=@CMAKE_INSTALL_PREFIX@/share/cmake -S $pathtosource -B $pathtobuild" if [[ $noop_flag -eq 1 ]]; then echo $cmd diff --git a/xo-cmake/cmake/xo_macros/xo_cxx.cmake b/xo-cmake/cmake/xo_macros/xo_cxx.cmake index a5c0e3c3..6679c6c2 100644 --- a/xo-cmake/cmake/xo_macros/xo_cxx.cmake +++ b/xo-cmake/cmake/xo_macros/xo_cxx.cmake @@ -330,6 +330,8 @@ macro(xo_docdir_doxygen_config) find_program(DOXYGEN_EXECUTABLE NAMES doxygen REQUIRED) message(STATUS "DOXYGEN_EXECUTABLE=${DOXYGEN_EXECUTABLE}") + message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}") + execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --doxygen-template OUTPUT_VARIABLE DOXYGEN_CONFIG_TEMPLATE) message(STATUS "DOXYGEN_CONFIG_TEMPLATE=${DOXYGEN_CONFIG_TEMPLATE}")