Merge pull request #252 from ClausKlein/feature/update-msvc-toolchain

aminya · Mar 11, 2024 · d646582 · d646582
2 parents 2108560 + 339ea38
commit d646582
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/CrossCompiler.cmake b/src/CrossCompiler.cmake
@@ -356,7 +356,7 @@ macro(enable_cross_compiler)
     else()
       if(NOT DEFINED EMSCRIPTEN_ROOT)
         include(FetchContent)
-        message(STATUS "fetch emscripten repo. ...")
+        message(STATUS "fetch emscripten repo main branch. ...")
         FetchContent_Declare(
           emscripten GIT_REPOSITORY https://github.com/emscripten-core/emscripten GIT_TAG main
         )

diff --git a/src/VCEnvironment.cmake b/src/VCEnvironment.cmake
@@ -60,7 +60,7 @@ macro(msvc_toolchain)
       include(FetchContent)
       FetchContent_Declare(
         _msvc_toolchain GIT_REPOSITORY "https://github.com/MarkSchofield/WindowsToolchain.git"
-        GIT_TAG "17c6d4ff6531ee268b9a22a8bcfbb3809e970e4e"
+        GIT_TAG "v0.9.0"
       )
       FetchContent_MakeAvailable(_msvc_toolchain)
       include("${_msvc_toolchain_SOURCE_DIR}/Windows.MSVC.toolchain.cmake")

diff --git a/tests/myproj/tests/CMakeLists.txt b/tests/myproj/tests/CMakeLists.txt
@@ -0,0 +1,20 @@
+cmake_minimum_required(VERSION 3.21...3.29)
+
+set(CMAKE_CXX_STANDARD 20)
+
+project(myproj_test VERSION 0.2.0 LANGUAGES CXX)
+
+find_package(myproj_header_only_lib 0.2.0 CONFIG REQUIRED)
+
+# Executable
+add_executable(main ../src/main/main.cpp)
+target_link_libraries(
+  main
+  PRIVATE myproj_header_only_lib::lib #
+          myproj_header_only_lib::myproj_project_options
+          myproj_header_only_lib::myproj_project_warnings
+)
+
+## tests
+enable_testing()
+add_test(NAME main COMMAND main)