diff --git a/.gitmodules b/.gitmodules index 442ac76345bc8676ac9ff97ebddd226b829c9542..1ae3a515ca97c782c0ffddb7421022274bd84a3a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "externals/fmt"] - path = externals/fmt +[submodule "libs/fmt"] + path = libs/fmt url = https://github.com/fmtlib/fmt.git diff --git a/CMakeLists.txt b/CMakeLists.txt index de09ca6eb78b0709d71196ec3f5955e345de2ce8..cf9f42f0c15e2b700a53af215bee80758d04a8c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,10 +17,10 @@ dune_enable_all_packages(MODULE_LIBRARIES amdis fmt) add_subdirectory("bin") add_subdirectory("cmake/modules") add_subdirectory("doc") -add_subdirectory("externals") +add_subdirectory("examples" EXCLUDE_FROM_ALL) +add_subdirectory("libs") add_subdirectory("src") add_subdirectory("test") -add_subdirectory("examples" EXCLUDE_FROM_ALL) target_link_libraries(amdis fmt) diff --git a/externals/CMakeLists.txt b/libs/CMakeLists.txt similarity index 89% rename from externals/CMakeLists.txt rename to libs/CMakeLists.txt index 119453ecae6e0574354ce7d9dee84b652323e5ba..2234cb005fafbb9ce33921fbf96a5fcc3b808505 100644 --- a/externals/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -12,7 +12,7 @@ if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") endif() endif() -if (NOT EXISTS "${PROJECT_SOURCE_DIR}/externals/fmt/CMakeLists.txt") +if (NOT EXISTS "${PROJECT_SOURCE_DIR}/libs/fmt/CMakeLists.txt") message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.") endif() @@ -23,7 +23,7 @@ dune_library_add_sources(fmt SOURCES ) target_include_directories(fmt PUBLIC - $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/externals/fmt/include>) + $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/libs/fmt/include>) install(FILES fmt/include/fmt/core.h diff --git a/externals/fmt b/libs/fmt similarity index 100% rename from externals/fmt rename to libs/fmt