Skip to content

Commit d646582

Browse files
authored
Merge pull request #252 from ClausKlein/feature/update-msvc-toolchain
2 parents 2108560 + 339ea38 commit d646582

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

src/CrossCompiler.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ macro(enable_cross_compiler)
356356
else()
357357
if(NOT DEFINED EMSCRIPTEN_ROOT)
358358
include(FetchContent)
359-
message(STATUS "fetch emscripten repo. ...")
359+
message(STATUS "fetch emscripten repo main branch. ...")
360360
FetchContent_Declare(
361361
emscripten GIT_REPOSITORY https://github.com/emscripten-core/emscripten GIT_TAG main
362362
)

src/VCEnvironment.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ macro(msvc_toolchain)
6060
include(FetchContent)
6161
FetchContent_Declare(
6262
_msvc_toolchain GIT_REPOSITORY "https://github.com/MarkSchofield/WindowsToolchain.git"
63-
GIT_TAG "17c6d4ff6531ee268b9a22a8bcfbb3809e970e4e"
63+
GIT_TAG "v0.9.0"
6464
)
6565
FetchContent_MakeAvailable(_msvc_toolchain)
6666
include("${_msvc_toolchain_SOURCE_DIR}/Windows.MSVC.toolchain.cmake")

tests/myproj/tests/CMakeLists.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
cmake_minimum_required(VERSION 3.21...3.29)
2+
3+
set(CMAKE_CXX_STANDARD 20)
4+
5+
project(myproj_test VERSION 0.2.0 LANGUAGES CXX)
6+
7+
find_package(myproj_header_only_lib 0.2.0 CONFIG REQUIRED)
8+
9+
# Executable
10+
add_executable(main ../src/main/main.cpp)
11+
target_link_libraries(
12+
main
13+
PRIVATE myproj_header_only_lib::lib #
14+
myproj_header_only_lib::myproj_project_options
15+
myproj_header_only_lib::myproj_project_warnings
16+
)
17+
18+
## tests
19+
enable_testing()
20+
add_test(NAME main COMMAND main)

0 commit comments

Comments
 (0)