Merge pull request #2 from emrekovanci/develop

emrekovanci · web-flow · commit c67f84b998e2 · 2024-04-19T13:24:45.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.os }} ${{ matrix.compiler }} ${{ matrix.build_type }}
+    name: ${{ matrix.os }} ${{ matrix.compiler }} ${{ matrix.build_type }} ${{ matrix.config.name }}
     if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
     runs-on: ${{ matrix.os }}
     timeout-minutes: 120
@@ -25,6 +25,9 @@ jobs:
         build_type:
           - Debug
           - Release
+        config:
+          - { name: Shared, flags: -DBUILD_SHARED_LIBS=TRUE }
+          - { name: Static, flags: -DBUILD_SHARED_LIBS=FALSE }
 
         exclude:
           - os: windows-2022
@@ -36,9 +39,19 @@ jobs:
           - os: windows-2022
             compiler: msvc
             build_type: Debug
+            config: { name: Shared, flags: -DBUILD_SHARED_LIBS=TRUE }
+          - os: windows-2022
+            compiler: msvc
+            build_type: Debug
+            config: { name: Static, flags: -DBUILD_SHARED_LIBS=FALSE }
           - os: windows-2022
             compiler: msvc
             build_type: Release
+            config: { name: Shared, flags: -DBUILD_SHARED_LIBS=TRUE }
+          - os: windows-2022
+            compiler: msvc
+            build_type: Release
+            config: { name: Static, flags: -DBUILD_SHARED_LIBS=FALSE }
 
     steps:
       - name: Checkout Code
@@ -59,9 +72,9 @@ jobs:
         shell: bash
         run: |
           if [ "${{ runner.os }}" == "Windows" ]; then
-            cmake --preset=Windows-${{ matrix.compiler }}-${{ matrix.build_type }}
+            cmake --preset=Windows-${{ matrix.compiler }}-${{ matrix.build_type }} ${{ matrix.config.flags }}
           else
-            cmake --preset=${{ matrix.compiler }}-${{ matrix.build_type }}
+            cmake --preset=${{ matrix.compiler }}-${{ matrix.build_type }} ${{ matrix.config.flags }}
           fi
 
       - name: CMake Build
@@ -72,6 +85,16 @@ jobs:
           else
             cmake --build --preset=${{ matrix.compiler }}-${{ matrix.build_type }}
           fi
+
+      - name: Install
+        shell: bash
+        run: |
+          if [ "${{ runner.os }}" == "Windows" ]; then
+            cmake --install out/build/Windows-${{ matrix.compiler }}-${{ matrix.build_type }} --prefix prefix
+          else
+            cmake --install out/build/${{ matrix.compiler }}-${{ matrix.build_type }} --prefix prefix
+          fi
+
       - name: Test
         if: ${{ matrix.build_type == 'Debug' }}
         shell: bash
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.26)
 
+include(cmake/PreventInSourceBuilds.cmake)
+
 project(
     Template-CPP
     VERSION 0.1.0
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -45,8 +45,9 @@
             "inherits": "confs-windows-common",
             "cacheVariables": {
                 "CMAKE_CXX_COMPILER": "cl",
-                "CMAKE_CXX_FLAGS": "/diagnostics:caret /utf-8 /sdl /w14165 /w44242 /w44254 /w44263 /w34265 /w34287 /w44296 /w44388 /w44464 /w14545 /w14546 /w14547 /w14549 /w14555 /w34619 /w34640 /w24826 /w14905 /w14906 /w14928 /w45038 /W4 /permissive- /volatile:iso /Zc:inline /Zc:preprocessor /Zc:enumTypes /Zc:lambda /Zc:__cplusplus /Zc:externConstexpr /Zc:throwingNew /EHsc",
-                "CMAKE_EXE_LINKER_FLAGS": "/machine:x64"
+                "CMAKE_CXX_FLAGS": "/sdl /guard:cf /utf-8 /diagnostics:caret /sdl /w14165 /w44242 /w44254 /w44263 /w34265 /w34287 /w44296 /w44388 /w44464 /w14545 /w14546 /w14547 /w14549 /w14555 /w34619 /w34640 /w24826 /w14905 /w14906 /w14928 /w45038 /W4 /permissive- /volatile:iso /Zc:inline /Zc:preprocessor /Zc:enumTypes /Zc:lambda /Zc:__cplusplus /Zc:externConstexpr /Zc:throwingNew /EHsc",
+                "CMAKE_EXE_LINKER_FLAGS": "/machine:x64 /guard:cf",
+                "CMAKE_SHARED_LINKER_FLAGS": "/machine:x64 /guard:cf"
             },
             "vendor": {
                 "microsoft.com/VisualStudioSettings/CMake/1.0": {
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -1,5 +1,5 @@
-# Define executable and its properties
+# ---- Define executable ----
+
 add_executable(Application App.cpp)
 target_link_libraries(Application PRIVATE Core)
-set_target_properties(Application PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Application)
 install(TARGETS Application)
diff --git a/cmake/PreventInSourceBuilds.cmake b/cmake/PreventInSourceBuilds.cmake
@@ -0,0 +1,9 @@
+# ---- In-source guard ----
+
+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+    message(
+        FATAL_ERROR
+        "In-source builds are not supported. "
+        "You may need to delete 'CMakeCache.txt' and 'CMakeFiles/' first."
+    )
+endif()
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -10,16 +10,37 @@ set(LIBRARY_SOURCES
     ${SRCROOT}/Lib.cpp
 )
 
-# Define library and its properties
-add_library(Core STATIC ${LIBRARY_HEADERS} ${LIBRARY_SOURCES})
+# ---- Define library ----
+add_library(Core ${LIBRARY_HEADERS} ${LIBRARY_SOURCES})
 target_include_directories(Core PUBLIC ${PROJECT_SOURCE_DIR}/library/include)
 target_compile_features(Core PUBLIC cxx_std_17)
+
+include(GenerateExportHeader)
+generate_export_header(Core
+    EXPORT_FILE_NAME Core_Export.h
+    EXPORT_MACRO_NAME CORE_API
+    NO_EXPORT_MACRO_NAME CORE_PRIVATE
+)
+target_sources(Core
+    PUBLIC
+        FILE_SET HEADERS
+        BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR}
+        FILES ${CMAKE_CURRENT_BINARY_DIR}/Core_Export.h
+)
+
+if(NOT BUILD_SHARED_LIBS)
+    target_compile_definitions(Core PUBLIC CORE_STATIC_DEFINE)
+endif()
+
+set_target_properties(Core PROPERTIES
+    CXX_VISIBILITY_PRESET hidden
+    VISIBILITY_INLINES_HIDDEN YES
+    VERSION "${PROJECT_VERSION}"
+    SOVERSION "${PROJECT_VERSION_MAJOR}"
+)
+
 install(TARGETS Core)
 
 if (FEATURE_TESTS)
     add_subdirectory(${PROJECT_SOURCE_DIR}/library/test)
 endif()
-
-# Group headers and sources for IDE
-source_group(TREE ${INCROOT} PREFIX "Headers" FILES ${LIBRARY_HEADERS})
-source_group(TREE ${SRCROOT} PREFIX "Sources" FILES ${LIBRARY_SOURCES})
diff --git a/library/include/Core/Lib.hpp b/library/include/Core/Lib.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
+#include "Core_Export.h"
+
 #include <string>
 
-struct Lib
+struct CORE_API Lib
 {
     Lib();
 
diff --git a/library/test/CMakeLists.txt b/library/test/CMakeLists.txt
@@ -1,7 +1,14 @@
+# ---- Dependencies ----
+
 include(Catch)
+set(CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE PRE_TEST)
+
+# ---- Define executable ----
 
-add_executable(CoreTests ${PROJECT_SOURCE_DIR}/library/test/Tests.cpp)
+add_executable(CoreTests Tests.cpp)
 target_link_libraries(CoreTests PRIVATE Core Catch2::Catch2WithMain)
 target_compile_features(CoreTests PRIVATE cxx_std_17)
-set_target_properties(CoreTests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Core/Tests)
-catch_discover_tests(CoreTests)
+
+# ---- Tests ----
+
+catch_discover_tests(CoreTests WORKING_DIRECTORY $<TARGET_FILE_DIR:Core>)
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -3,6 +3,6 @@
     "default-registry": {
         "kind": "git",
         "repository": "https://github.com/microsoft/vcpkg",
-        "baseline": "13c3c0fcc203d179f4443fe48d252e3ff220cbeb"
+        "baseline": "6c87aab05cb2ebd1c9e382167edf3b15a7718e70"
     }
 }
diff --git a/vcpkg.json b/vcpkg.json
@@ -12,7 +12,7 @@
             "dependencies": [
                 {
                     "name": "catch2",
-                    "version>=": "3.4.0"
+                    "version>=": "3.5.0"
                 }
             ]
         }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,10 @@`
`1`	`1`	`#pragma once`
`2`	`2`
	`3`	`+#include "Core_Export.h"`
	`4`	`+`
`3`	`5`	`#include <string>`
`4`	`6`
`5`		`-struct Lib`
	`7`	`+struct CORE_API Lib`
`6`	`8`	`{`
`7`	`9`	`Lib();`
`8`	`10`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`"default-registry": {`
`4`	`4`	`"kind": "git",`
`5`	`5`	`"repository": "https://github.com/microsoft/vcpkg",`
`6`		`- "baseline": "13c3c0fcc203d179f4443fe48d252e3ff220cbeb"`
	`6`	`+ "baseline": "6c87aab05cb2ebd1c9e382167edf3b15a7718e70"`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`"dependencies": [`
`13`	`13`	`{`
`14`	`14`	`"name": "catch2",`
`15`		`- "version>=": "3.4.0"`
	`15`	`+ "version>=": "3.5.0"`
`16`	`16`	`}`
`17`	`17`	`]`
`18`	`18`	`}`