Skip to content

Commit

Permalink
modules -> external + added leissa/fe
Browse files Browse the repository at this point in the history
  • Loading branch information
leissa committed Oct 2, 2023
1 parent 478c4b4 commit b1afd2f
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 23 deletions.
15 changes: 9 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
[submodule "abseil-cpp"]
path = modules/abseil-cpp
path = external/modules/abseil-cpp
url = ../../abseil/abseil-cpp
[submodule "doxygen-awesome-css"]
path = modules/doxygen-awesome-css
path = external/modules/doxygen-awesome-css
url = ../../jothepro/doxygen-awesome-css.git
[submodule "googletest"]
path = modules/googletest
path = external/modules/googletest
url = ../../google/googletest.git
[submodule "half"]
path = modules/half
path = external/modules/half
url = ../../AnyDSL/half.git
[submodule "lyra"]
path = modules/lyra
path = external/modules/lyra
url = ../../bfgroup/lyra.git
[submodule "modules/rang"]
path = modules/rang
path = external/modules/rang
url = ../../agauniyal/rang.git
[submodule "external/fe"]
path = external/fe
url = ../../leissa/fe.git
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
if(BUILD_TESTING)
include(GoogleTest)
set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
add_subdirectory(modules/googletest EXCLUDE_FROM_ALL)
add_subdirectory(external/googletest EXCLUDE_FROM_ALL)
add_subdirectory(gtest)
add_subdirectory(lit)
endif()
Expand All @@ -67,13 +67,13 @@ set(ABSL_PROPAGATE_CXX_STD ON)
set(ABSL_USE_EXTERNAL_GOOGLETEST ON)
set(ABSL_ENABLE_INSTALL ON)
if(NOT THORIN_INSTALL_DEPENDENCIES)
add_subdirectory(modules/abseil-cpp EXCLUDE_FROM_ALL)
add_subdirectory(modules/rang EXCLUDE_FROM_ALL)
add_subdirectory(modules/lyra EXCLUDE_FROM_ALL)
add_subdirectory(external/abseil-cpp EXCLUDE_FROM_ALL)
add_subdirectory(external/rang EXCLUDE_FROM_ALL)
add_subdirectory(external/lyra EXCLUDE_FROM_ALL)
else()
add_subdirectory(modules/abseil-cpp)
add_subdirectory(modules/rang)
add_subdirectory(modules/lyra)
add_subdirectory(external/abseil-cpp)
add_subdirectory(external/rang)
add_subdirectory(external/lyra)
endif()
add_subdirectory(thorin)
add_subdirectory(cli)
Expand Down
16 changes: 8 additions & 8 deletions docs/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -1337,11 +1337,11 @@ HTML_STYLESHEET =
# list). For an example see the documentation.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_STYLESHEET = modules/doxygen-awesome-css/doxygen-awesome.css \
modules/doxygen-awesome-css/doxygen-awesome-sidebar-only.css \
modules/doxygen-awesome-css/doxygen-awesome-sidebar-only-darkmode-toggle.css \
modules/doxygen-awesome-css/doxygen-awesome-interactive-toc.js \
modules/doxygen-awesome-css/doxygen-custom/custom.css
HTML_EXTRA_STYLESHEET = external/doxygen-awesome-css/doxygen-awesome.css \
external/doxygen-awesome-css/doxygen-awesome-sidebar-only.css \
external/doxygen-awesome-css/doxygen-awesome-sidebar-only-darkmode-toggle.css \
external/doxygen-awesome-css/doxygen-awesome-interactive-toc.js \
external/doxygen-awesome-css/doxygen-custom/custom.css

# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
# other source files which should be copied to the HTML output directory. Note
Expand All @@ -1351,9 +1351,9 @@ HTML_EXTRA_STYLESHEET = modules/doxygen-awesome-css/doxygen-awesome.css \
# files will be copied as-is; there are no commands or markers available.
# This tag requires that the tag GENERATE_HTML is set to YES.

HTML_EXTRA_FILES = modules/doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js \
modules/doxygen-awesome-css/doxygen-awesome-fragment-copy-button.js \
modules/doxygen-awesome-css/doxygen-awesome-paragraph-link.js
HTML_EXTRA_FILES = external/doxygen-awesome-css/doxygen-awesome-darkmode-toggle.js \
external/doxygen-awesome-css/doxygen-awesome-fragment-copy-button.js \
external/doxygen-awesome-css/doxygen-awesome-paragraph-link.js

# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
# should be rendered with a dark or light theme.
Expand Down
1 change: 1 addition & 0 deletions external/fe
Submodule fe added at 6f8f51
4 changes: 2 additions & 2 deletions thorin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ target_include_directories(libthorin
PUBLIC
$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include/> # for config.h
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..> # for thorin/*
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../modules/half/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../external/half/include>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(libthorin
Expand Down Expand Up @@ -137,6 +137,6 @@ install(
DESTINATION include/thorin
)
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/../modules/half/include/half.hpp"
FILES "${CMAKE_CURRENT_SOURCE_DIR}/../external/half/include/half.hpp"
DESTINATION include
)

0 comments on commit b1afd2f

Please sign in to comment.