diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4e05da80..60d6720f 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -165,7 +165,7 @@ if (FMT_PEDANTIC "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}" "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" "-DCXX_STANDARD_FLAG=${CXX_STANDARD_FLAG}" - "-DFMT_DIR=${CMAKE_SOURCE_DIR}") + "-Dfmt_DIR=${CMAKE_SOURCE_DIR}") # Test if the targets are found from the build directory. add_test( @@ -186,7 +186,7 @@ if (FMT_PEDANTIC "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" "-DFMT_IMPORT_STD=${FMT_IMPORT_STD}" "-DCMAKE_EXPERIMENTAL_CXX_IMPORT_STD=${CMAKE_EXPERIMENTAL_CXX_IMPORT_STD}" - "-DFMT_DIR=${PROJECT_BINARY_DIR}" + "-Dfmt_DIR=${PROJECT_BINARY_DIR}" "-DPEDANTIC_COMPILE_FLAGS=${PEDANTIC_COMPILE_FLAGS}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") diff --git a/test/compile-error-test/CMakeLists.txt b/test/compile-error-test/CMakeLists.txt index 24160dc3..48c081c8 100644 --- a/test/compile-error-test/CMakeLists.txt +++ b/test/compile-error-test/CMakeLists.txt @@ -79,7 +79,7 @@ function (run_tests) " cmake_minimum_required(VERSION 3.8...4.4) project(tests CXX) - add_subdirectory(${FMT_DIR} fmt) + add_subdirectory(${fmt_DIR} fmt) ${cmake_targets} ") @@ -91,7 +91,7 @@ function (run_tests) "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}" "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}" "-DCMAKE_GENERATOR=${CMAKE_GENERATOR}" - "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" "-DFMT_DIR=${FMT_DIR}" + "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" "-Dfmt_DIR=${fmt_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/test" WORKING_DIRECTORY "${build_directory}" RESULT_VARIABLE result_var diff --git a/test/find-package-test/CMakeLists.txt b/test/find-package-test/CMakeLists.txt index 02bbe3ef..3d284b60 100644 --- a/test/find-package-test/CMakeLists.txt +++ b/test/find-package-test/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8...4.4) project(fmt-test CXX) -find_package(FMT REQUIRED) +find_package(fmt REQUIRED) # TODO(CK): find_package(fmt 12.2.0 EXACT COMPONENTS fmt fmt-module fmt-header-only) set(PEDANTIC_COMPILE_FLAGS)