diff --git a/recipe/activate-clang-cl_win-64.bat b/recipe/activate-clang-cl_win-64.bat index 13b39c7..05a1222 100644 --- a/recipe/activate-clang-cl_win-64.bat +++ b/recipe/activate-clang-cl_win-64.bat @@ -8,6 +8,6 @@ set "AR=llvm-ar.exe" set "RANLIB=llvm-ranlib.exe" set "CPPFLAGS_USED=-D_CRT_SECURE_NO_WARNINGS -fms-runtime-lib=dll -fuse-ld=lld" -set "LDFLAGS=/link /DEFAULTLIB:%CONDA_PREFIX%\lib\clang\@MAJOR_VER@\lib\windows\clang_rt.builtins-x86_64.lib" +set "LDFLAGS=/DEFAULTLIB:%CONDA_PREFIX%\lib\clang\@MAJOR_VER@\lib\windows\clang_rt.builtins-x86_64.lib" set "CFLAGS=@CFLAGS@ %CPPFLAGS_USED%" set "CXXFLAGS=@CXXFLAGS@ /std:c++17 %CPPFLAGS_USED%" diff --git a/recipe/cmake_test_c/CMakeLists.txt b/recipe/cmake_test_c/CMakeLists.txt new file mode 100644 index 0000000..f7bf73c --- /dev/null +++ b/recipe/cmake_test_c/CMakeLists.txt @@ -0,0 +1,2 @@ +cmake_minimum_required(VERSION 3.12) +project(cf_dummy LANGUAGES C) diff --git a/recipe/cmake_test_cxx/CMakeLists.txt b/recipe/cmake_test_cxx/CMakeLists.txt new file mode 100644 index 0000000..b1a5a1a --- /dev/null +++ b/recipe/cmake_test_cxx/CMakeLists.txt @@ -0,0 +1,2 @@ +cmake_minimum_required(VERSION 3.12) +project(cf_dummy LANGUAGES CXX) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index afce942..1b2940f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ {% set cl_minor = CL_VERSION.split(".")[1] %} {% set vc_major = VCVER.split(".")[0] %} -{% set build_number = 19 %} +{% set build_number = 20 %} # separate builds number for headers & winsdk; reset when version increases (resp. all relevant versions) {% set headers_build_number = 5 %} @@ -111,7 +111,11 @@ outputs: - clang_impl_{{ target_platform }} # [osx] - gcc_impl_{{ target_platform }} # [linux] test: + requires: + - cmake + - ninja files: + - cmake_test_c/ - test.c - run_test_clang.sh # [not win] - run_test_clang.bat # [win] @@ -143,7 +147,11 @@ outputs: - clangxx_impl_{{ target_platform }} # [osx] - gxx_impl_{{ target_platform }} # [linux] test: + requires: + - cmake + - ninja files: + - cmake_test_cxx/ - test.cpp - run_test_clangxx.sh # [not win] - run_test_clangxx.bat # [win] @@ -182,7 +190,12 @@ outputs: # avoid conflicating activations - clang_win-64 <0.0a0 test: + requires: + - cmake + - ninja files: + - cmake_test_c/ + - cmake_test_cxx/ - test.c - test.cpp - run_test_clang.bat diff --git a/recipe/run_test_clang.bat b/recipe/run_test_clang.bat index 83a2155..43ca376 100644 --- a/recipe/run_test_clang.bat +++ b/recipe/run_test_clang.bat @@ -10,3 +10,6 @@ if [%CC%] == [clang-cl.exe] ( a.exe if %ERRORLEVEL% neq 0 exit 1 ) + +cmake -G Ninja cmake_test_c +if %ERRORLEVEL% neq 0 exit 1 diff --git a/recipe/run_test_clang.sh b/recipe/run_test_clang.sh index 5e19391..2a4d84e 100644 --- a/recipe/run_test_clang.sh +++ b/recipe/run_test_clang.sh @@ -5,3 +5,5 @@ echo "CONDA_BUILD_WINSDK: $CONDA_BUILD_WINSDK" echo "CI: $CI" $CC $CFLAGS test.c $LDFLAGS -v test -f a.exe + +cmake -G Ninja ./cmake_test_c diff --git a/recipe/run_test_clangxx.bat b/recipe/run_test_clangxx.bat index 828f982..164993e 100644 --- a/recipe/run_test_clangxx.bat +++ b/recipe/run_test_clangxx.bat @@ -10,3 +10,6 @@ if [%CXX%] == [clang-cl.exe] ( a.exe if %ERRORLEVEL% neq 0 exit 1 ) + +cmake -G Ninja cmake_test_cxx +if %ERRORLEVEL% neq 0 exit 1 diff --git a/recipe/run_test_clangxx.sh b/recipe/run_test_clangxx.sh index c77d7b4..8cec142 100644 --- a/recipe/run_test_clangxx.sh +++ b/recipe/run_test_clangxx.sh @@ -5,3 +5,5 @@ echo "CONDA_BUILD_WINSDK: $CONDA_BUILD_WINSDK" echo "CI: $CI" $CXX $CXXFLAGS test.cpp $LDFLAGS -v test -f a.exe + +cmake -G Ninja ./cmake_test_cxx