From d7360c358906c8bb026fed5cb2b0e95074b1e98a Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Mon, 11 Mar 2024 06:08:20 +0100 Subject: [PATCH 1/3] Update WindowsToolchain to v0.9.0 --- src/CrossCompiler.cmake | 2 +- src/VCEnvironment.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CrossCompiler.cmake b/src/CrossCompiler.cmake index 4af0b26f..6e3bc007 100644 --- 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(WARNING "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 index d9a783ba..07e22464 100644 --- 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") From 8b71324c416cca40b9183b74e2a05112468903ac Mon Sep 17 00:00:00 2001 From: ClausKlein Date: Mon, 11 Mar 2024 06:59:09 +0100 Subject: [PATCH 2/3] Add test installed version project --- tests/myproj/tests/CMakeLists.txt | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 tests/myproj/tests/CMakeLists.txt diff --git a/tests/myproj/tests/CMakeLists.txt b/tests/myproj/tests/CMakeLists.txt new file mode 100644 index 00000000..53fad388 --- /dev/null +++ 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) From 339ea38f792da48061cbfa3cc8e1f135664833e6 Mon Sep 17 00:00:00 2001 From: Claus Klein Date: Mon, 11 Mar 2024 16:40:11 +0100 Subject: [PATCH 3/3] Update src/CrossCompiler.cmake Co-authored-by: Amin Yahyaabadi --- src/CrossCompiler.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CrossCompiler.cmake b/src/CrossCompiler.cmake index 6e3bc007..0b99ac5e 100644 --- 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(WARNING "fetch emscripten repo main branch. ...") + message(STATUS "fetch emscripten repo main branch. ...") FetchContent_Declare( emscripten GIT_REPOSITORY https://github.com/emscripten-core/emscripten GIT_TAG main )