Removed repo dispatch; Externals built in build dir; CMake improvements

Langulus · Oct 8, 2023 · 3314fbe · 3314fbe
1 parent cdc3f0b
commit 3314fbe
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 61 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,5 @@
 name: Langulus::Logger CI
-on: [push, repository_dispatch]
+on: push
 concurrency:
   group: ${{ github.ref }}
   cancel-in-progress: true

diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,14 +10,14 @@ if (PROJECT_IS_TOP_LEVEL OR NOT LANGULUS)
     include(LangulusUtilities.cmake)
 
     # Add Langulus::Core library                                            
-    fetch_langulus_module(Core)
+    fetch_langulus_module(Core GIT_TAG 39ae88b)
 endif()
 
 # Configure {fmt} library                                                   
 fetch_external_module(
     fmt
     GIT_REPOSITORY https://github.com/fmtlib/fmt.git
-    GIT_TAG        5bdce18 # master branch
+    GIT_TAG        8e0ca05 # master branch
 )
 
 # Build and install Logger library                                          

diff --git a/LangulusUtilities.cmake b/LangulusUtilities.cmake
@@ -1,20 +1,20 @@
 include(FetchContent)
 
-function(fetch_langulus_module NAME)
+function(fetch_langulus_module NAME GIT_TAG TAG)
     if(NOT DEFINED LANGULUS_EXTERNAL_DIRECTORY)
         set(LANGULUS_EXTERNAL_DIRECTORY "${CMAKE_SOURCE_DIR}/external" CACHE PATH
-            "Place where external dependencies will be downloaded and configured")
+            "Place where external dependencies will be downloaded")
         message(WARNING "LANGULUS_EXTERNAL_DIRECTORY not defined, using default: ${LANGULUS_EXTERNAL_DIRECTORY}")
     endif()
 
-    message(STATUS "Fetching external Langulus${NAME}...")
+    message(STATUS "Fetching external Langulus::${NAME}...")
     FetchContent_Declare(
         Langulus${NAME}
         GIT_REPOSITORY  https://github.com/Langulus/${NAME}.git
-        GIT_TAG         main
+        GIT_TAG         ${TAG}
         GIT_SHALLOW     TRUE
-        SOURCE_DIR      ${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src
-        SUBBUILD_DIR    ${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-subbuild
+        SOURCE_DIR      "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src"
+        SUBBUILD_DIR    "${CMAKE_BINARY_DIR}/external/${NAME}-subbuild"
         ${ARGN}
     )
     FetchContent_MakeAvailable(Langulus${NAME})
@@ -23,7 +23,7 @@ endfunction()
 function(fetch_external_module NAME GIT_REPOSITORY REPO GIT_TAG TAG)
     if(NOT DEFINED LANGULUS_EXTERNAL_DIRECTORY)
         set(LANGULUS_EXTERNAL_DIRECTORY "${CMAKE_SOURCE_DIR}/external" CACHE PATH
-            "Place where external dependencies will be downloaded and configured")
+            "Place where external dependencies will be downloaded")
         message(WARNING "LANGULUS_EXTERNAL_DIRECTORY not defined, using default: ${LANGULUS_EXTERNAL_DIRECTORY}")
     endif()
 
@@ -33,7 +33,7 @@ function(fetch_external_module NAME GIT_REPOSITORY REPO GIT_TAG TAG)
         GIT_REPOSITORY  ${REPO}
         GIT_TAG         ${TAG}
         SOURCE_DIR      "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-src"
-        SUBBUILD_DIR    "${LANGULUS_EXTERNAL_DIRECTORY}/${NAME}-subbuild"
+        SUBBUILD_DIR    "${CMAKE_BINARY_DIR}/external/${NAME}-subbuild"
         ${ARGN}
     )
     FetchContent_MakeAvailable(${NAME})
@@ -43,19 +43,6 @@ function(fetch_external_module NAME GIT_REPOSITORY REPO GIT_TAG TAG)
     set(${NAME}_BINARY_DIR "${${LOWERCASE_NAME}_BINARY_DIR}" CACHE INTERNAL "")
 endfunction()
 
-function(langulus_init_git_submodule NAME)
-	if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${NAME}/.git" )
-        # Submodule hasn't been initialized yet, so call git submodule update --init on it
-        message(STATUS "Initializing submodule: ${CMAKE_CURRENT_SOURCE_DIR}/${NAME}...")
-        find_package(Git REQUIRED)
-        execute_process(
-            COMMAND ${GIT_EXECUTABLE} submodule update --init -- ${NAME} 
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMAND_ERROR_IS_FATAL ANY
-        )
-	endif()
-endfunction()
-
 function(langulus_copy_dlls TARGET ON THIS)
     if(WIN32 AND LANGULUS_SHARED_LIBRARIES)
         add_custom_command(
@@ -65,16 +52,3 @@ function(langulus_copy_dlls TARGET ON THIS)
         )
     endif()
 endfunction()
-
-function(langulus_copy_dlls_advanced THIS TO TARGET FROM)
-    if(WIN32)
-        add_dependencies(${TARGET} ${ARGN})
-        foreach(element ${ARGN})
-            add_custom_command(
-                TARGET ${THIS} POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:${element}>" "$<TARGET_FILE_DIR:${TARGET}>"
-                COMMENT "Copying `$<TARGET_FILE:${element}>` to `$<TARGET_FILE_DIR:${TARGET}>`"
-            )
-        endforeach()
-    endif()
-endfunction()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,8 +1,11 @@
-add_executable(LangulusLoggerTest
-	Main.cpp
-	TestLogger.cpp
+file(GLOB_RECURSE
+	LANGULUS_LOGGER_TEST_SOURCES 
+	LIST_DIRECTORIES FALSE CONFIGURE_DEPENDS
+	*.cpp *.hpp
 )
 
+add_executable(LangulusLoggerTest ${LANGULUS_LOGGER_TEST_SOURCES})
+
 target_link_libraries(LangulusLoggerTest
 	PRIVATE		LangulusLogger 
 				Catch2