roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-cmake: set CMAKE_MODULE_PATH -> works properly from nix

Browse source
This commit is contained in:
Roland Conybeare 2025-06-12 07:36:25 -05:00
commit 63cd31766e
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xo-cmake/bin/xo-build.in
View file

@ -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

2
xo-cmake/cmake/xo_macros/xo_cxx.cmake
View file

@ -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}")