Skip to content

Commit

Permalink
INSTALL and configure change if we switch to new ext repo, so for now…
Browse files Browse the repository at this point in the history
… conditionalize this check
  • Loading branch information
starseeker committed Aug 17, 2023
1 parent bd5f4c9 commit a027b5a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2464,6 +2464,9 @@ function(DIFF_FILE filename)
endif(NOT "${OLD_STR}" STREQUAL "${NEW_STR}")
endfunction(DIFF_FILE filename)

# TODO - once we remove src/other/ext, eliminate this guard and
# update INSTALL and configure to reflect the new approach.
if (EXISTS ${CMAKE_SOURCE_DIR}/src/other/ext)
# Finalize and check INSTALL file
file(READ "${BRLCAD_SOURCE_DIR}/INSTALL" SRC_INSTALL_STR)
string(REGEX REPLACE "${CONFIG_OPT_STRING}.*" "" INSTALL_PREFIX "${SRC_INSTALL_STR}")
Expand All @@ -2488,7 +2491,7 @@ DIFF_FILE(configure)
if(CONFIG_FATAL_ERROR)
message(FATAL_ERROR "Configure haulted because INSTALL and/or configure script are out of date.")
endif(CONFIG_FATAL_ERROR)

endif (EXISTS ${CMAKE_SOURCE_DIR}/src/other/ext)

# Because the build-time-delta needs a configure-file but comes at the
# end of the CMake configure, the preparation of the final distclean
Expand Down

0 comments on commit a027b5a

Please sign in to comment.