From 3ce8b6c54aa844338e68069096344540398339fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Lei=C3=9Fa?= Date: Thu, 28 Sep 2023 12:55:50 +0200 Subject: [PATCH] added fe subproject And also moving modules -> external to obey common dir layout guidelines. --- .gitmodules | 15 +++++++++------ CMakeLists.txt | 16 +++++++++------- {modules => external}/abseil-cpp | 0 {modules => external}/doxygen-awesome-css | 0 external/fe | 1 + {modules => external}/googletest | 0 {modules => external}/half | 0 {modules => external}/lyra | 0 {modules => external}/rang | 0 9 files changed, 19 insertions(+), 13 deletions(-) rename {modules => external}/abseil-cpp (100%) rename {modules => external}/doxygen-awesome-css (100%) create mode 160000 external/fe rename {modules => external}/googletest (100%) rename {modules => external}/half (100%) rename {modules => external}/lyra (100%) rename {modules => external}/rang (100%) diff --git a/.gitmodules b/.gitmodules index 26cb620918..ee9975c14a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,21 @@ [submodule "abseil-cpp"] - path = modules/abseil-cpp + path = external/abseil-cpp url = ../../abseil/abseil-cpp [submodule "doxygen-awesome-css"] - path = modules/doxygen-awesome-css + path = external/doxygen-awesome-css url = ../../jothepro/doxygen-awesome-css.git [submodule "googletest"] - path = modules/googletest + path = external/googletest url = ../../google/googletest.git [submodule "half"] - path = modules/half + path = external/half url = ../../AnyDSL/half.git [submodule "lyra"] - path = modules/lyra + path = external/lyra url = ../../bfgroup/lyra.git [submodule "modules/rang"] - path = modules/rang + path = external/rang url = ../../agauniyal/rang.git +[submodule "modules/fe"] + path = external/fe + url = git@github.com:leissa/fe.git diff --git a/CMakeLists.txt b/CMakeLists.txt index a7b321c3f1..2c92fa3f8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,20 +50,22 @@ include(CTest) if(BUILD_TESTING AND THORIN_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) endif() 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) + add_subdirectory(external/fe 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) + add_subdirectory(external/fe) endif() add_subdirectory(thorin) add_subdirectory(cli) diff --git a/modules/abseil-cpp b/external/abseil-cpp similarity index 100% rename from modules/abseil-cpp rename to external/abseil-cpp diff --git a/modules/doxygen-awesome-css b/external/doxygen-awesome-css similarity index 100% rename from modules/doxygen-awesome-css rename to external/doxygen-awesome-css diff --git a/external/fe b/external/fe new file mode 160000 index 0000000000..761796b1b7 --- /dev/null +++ b/external/fe @@ -0,0 +1 @@ +Subproject commit 761796b1b76cdb1bb4b11aeffe84622d3913f3d0 diff --git a/modules/googletest b/external/googletest similarity index 100% rename from modules/googletest rename to external/googletest diff --git a/modules/half b/external/half similarity index 100% rename from modules/half rename to external/half diff --git a/modules/lyra b/external/lyra similarity index 100% rename from modules/lyra rename to external/lyra diff --git a/modules/rang b/external/rang similarity index 100% rename from modules/rang rename to external/rang