Skip to content

Commit 4b0ebde

Browse files
committed
Specify bext_output subdir in the initial setting of the BRLCAD_EXT_INSTALL_DIR path.
1 parent 594adbe commit 4b0ebde

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

misc/CMake/BRLCAD_EXT_Setup.cmake

+4-4
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ function(brlcad_bext_init BEXT_SHA1)
7373
endif(NOT DEFINED BRLCAD_EXT_NOINSTALL_DIR AND EXISTS "${BRLCAD_EXT_DIR}/noinstall")
7474
endif(DEFINED BRLCAD_EXT_DIR)
7575

76-
# If we're doing the non-src-other build, we've got to have bext for at least a
77-
# few custom components no matter how many system packages are installed.
76+
# We've got to have bext for at least a few custom components no matter how
77+
# many system packages are installed.
7878
if(NOT DEFINED BRLCAD_EXT_NOINSTALL_DIR OR NOT DEFINED BRLCAD_EXT_INSTALL_DIR)
7979
message(
8080
WARNING
@@ -339,7 +339,7 @@ function(brlcad_ext_setup)
339339
find_program(GIT_EXEC git)
340340

341341
set(BRLCAD_EXT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/bext_build)
342-
set(BRLCAD_EXT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR})
342+
set(BRLCAD_EXT_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/bext_output)
343343

344344
# If we don't have the bext source directory, try to clone it. If the user
345345
# specified a BRLCAD_EXT_SOURCE_DIR we won't delete it, but if we end up
@@ -460,7 +460,7 @@ function(brlcad_ext_setup)
460460
endif(BEXT_BLD_CLEANUP)
461461

462462
# Persist key variables in the cache
463-
set(BRLCAD_EXT_DIR ${BRLCAD_EXT_INSTALL_DIR}/bext_output CACHE PATH "Local bext install" FORCE)
463+
set(BRLCAD_EXT_DIR ${BRLCAD_EXT_INSTALL_DIR} CACHE PATH "Local bext install" FORCE)
464464
set(BRLCAD_EXT_INSTALL_DIR ${BRLCAD_EXT_DIR}/install CACHE PATH "Local bext install" FORCE)
465465
set(BRLCAD_EXT_NOINSTALL_DIR ${BRLCAD_EXT_DIR}/noinstall CACHE PATH "Local bext install" FORCE)
466466
endfunction(brlcad_ext_setup)

0 commit comments

Comments
 (0)