From ac36f99f62041fb658a3692d019d16a72b476436 Mon Sep 17 00:00:00 2001 From: James Benton Date: Wed, 20 Nov 2019 17:23:42 +0000 Subject: [PATCH] Cleanup tests cmake scripts. --- tests/CMakeLists.txt | 3 +-- tests/test_compile_headers_as_c11/CMakeLists.txt | 2 +- tests/test_compile_headers_as_c99/CMakeLists.txt | 2 +- tests/test_compile_headers_as_cpp/CMakeLists.txt | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 63dccae..2fbdef7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,6 @@ cmake_minimum_required(VERSION 3.2) -set(CMAKE_TOOLCHAIN_FILE $ENV{WUT_ROOT}/share/wut.toolchain.cmake) project(tests) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) include_directories("test_compile_headers_common") add_subdirectory(test_compile_headers_as_c11) diff --git a/tests/test_compile_headers_as_c11/CMakeLists.txt b/tests/test_compile_headers_as_c11/CMakeLists.txt index e35c4e1..c531a76 100644 --- a/tests/test_compile_headers_as_c11/CMakeLists.txt +++ b/tests/test_compile_headers_as_c11/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(test_compile_headers_as_c11 C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) set(CMAKE_C_STANDARD 11) diff --git a/tests/test_compile_headers_as_c99/CMakeLists.txt b/tests/test_compile_headers_as_c99/CMakeLists.txt index aefd6aa..08687e8 100644 --- a/tests/test_compile_headers_as_c99/CMakeLists.txt +++ b/tests/test_compile_headers_as_c99/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.2) project(test_compile_headers_as_c99 C) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) set(CMAKE_C_STANDARD 99) diff --git a/tests/test_compile_headers_as_cpp/CMakeLists.txt b/tests/test_compile_headers_as_cpp/CMakeLists.txt index 10f1d23..dc92525 100644 --- a/tests/test_compile_headers_as_cpp/CMakeLists.txt +++ b/tests/test_compile_headers_as_cpp/CMakeLists.txt @@ -1,9 +1,8 @@ cmake_minimum_required(VERSION 3.2) project(test_compile_headers_as_cpp CXX) -include("${WUT_ROOT}/share/wut.cmake" REQUIRED) +include("${DEVKITPRO}/wut/share/wut.cmake" REQUIRED) add_executable(test_compile_headers_as_cpp main.cpp) -wut_enable_stdcpp(test_compile_headers_as_cpp) wut_create_rpx(test_compile_headers_as_cpp.rpx test_compile_headers_as_cpp)