Skip to content

Commit

Permalink
Shift include-only deps back to src/other
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Aug 17, 2023
1 parent 7a9fec8 commit 77cc22d
Show file tree
Hide file tree
Showing 361 changed files with 15 additions and 19 deletions.
2 changes: 1 addition & 1 deletion src/gtools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(LDIR "${BRLCAD_SOURCE_DIR}/src/other/ext/linenoise")
set(LDIR "${BRLCAD_SOURCE_DIR}/src/other/linenoise")

set(GTOOLS_INCLUDE_DIRS
${BU_INCLUDE_DIRS}
Expand Down
2 changes: 1 addition & 1 deletion src/libbg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(BG_INCLUDE_DIRS
${POLY2TRI_INCLUDE_DIRS}
${SPSR_INCLUDE_DIR}
${LMDB_INCLUDE_DIR}
${BRLCAD_SOURCE_DIR}/src/other/ext/Eigen
${BRLCAD_SOURCE_DIR}/src/other/Eigen
)

BRLCAD_LIB_INCLUDE_DIRS(bg BG_INCLUDE_DIRS "")
Expand Down
2 changes: 1 addition & 1 deletion src/libbn/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ BRLCAD_ADDEXEC(bn_randsph randsph.c "libbu;libbn" TEST)

# Testing with Eigen
BRLCAD_ADDEXEC(bn_eigen eigen.cpp "libbu;libbn" TEST)
target_include_directories(bn_eigen SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/other/ext/Eigen")
target_include_directories(bn_eigen SYSTEM PRIVATE "${CMAKE_SOURCE_DIR}/src/other/Eigen")

#
# *********** poly.c tests *************
Expand Down
2 changes: 1 addition & 1 deletion src/nirt/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(LDIR "${BRLCAD_SOURCE_DIR}/src/other/ext/linenoise")
set(LDIR "${BRLCAD_SOURCE_DIR}/src/other/linenoise")

set(NIRT_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
Expand Down
11 changes: 11 additions & 0 deletions src/other/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,17 @@ CMAKEFILES_IN_DIR(tkhtml_ignore_files tkhtml)
include("${CMAKE_CURRENT_SOURCE_DIR}/tktable.dist")
CMAKEFILES_IN_DIR(tktable_ignore_files tktable)

# The above libraries are all compilation targets with libraries, and so have
# build outputs that must be distributed with BRL-CAD. The following are
# either header-only libraries or built directly into executables, and as such
# may remain in place - they are needed only for building.
include("${CMAKE_CURRENT_SOURCE_DIR}/Eigen.dist")
CMAKEFILES_IN_DIR(Eigen_ignore_files Eigen)

# linenoise is used by applications directly
include(${CMAKE_CURRENT_SOURCE_DIR}/linenoise.dist)
CMAKEFILES_IN_DIR(linenoise_ignore_files linenoise)

CMAKEFILES(
README
CMakeLists.txt
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 77cc22d

Please sign in to comment.