diff --git a/.circleci/config.yml b/.circleci/config.yml index 0883e3f0..ba0f70ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -95,7 +95,7 @@ jobs: - checkout - run: *setup_units - run: *run_installer_tests - + unitsInstall-alt: docker: - image: helics/buildenv:builder diff --git a/CMakeLists.txt b/CMakeLists.txt index c799de5f..8e4241e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ else() endif() if(NOT UNITS_CMAKE_PROJECT_NAME) - set(UNITS_CMAKE_PROJECT_NAME UNITS) + set(UNITS_CMAKE_PROJECT_NAME UNITS) endif() diff --git a/test/find_package_tests/CMakeLists.txt b/test/find_package_tests/CMakeLists.txt index c1ad7011..50a91360 100644 --- a/test/find_package_tests/CMakeLists.txt +++ b/test/find_package_tests/CMakeLists.txt @@ -13,7 +13,7 @@ project(units-find-package-test) include(CTest) -if (NOT UNITS_TARGET) +if(NOT UNITS_TARGET) set(UNITS_TARGET units) endif() @@ -27,7 +27,9 @@ message(STATUS "Binary location is ${PROJECT_BINARY_DIR}") if(UNITS_BUILD_SHARED_LIBRARY) add_executable(shared-library-test-exe ../pkg_test_code/main.cpp) target_link_libraries(shared-library-test-exe ${UNITS_TARGET}::units) - target_compile_definitions(shared-library-test-exe PUBLIC UNITS_LIB_HEADER="${UNITS_TARGET}/units.hpp") + target_compile_definitions( + shared-library-test-exe PUBLIC UNITS_LIB_HEADER="${UNITS_TARGET}/units.hpp" + ) add_test(NAME shared-library-test COMMAND shared-library-test-exe) set_property(TEST shared-library-test PROPERTY PASS_REGULAR_EXPRESSION "10.7") diff --git a/test/pkg_test_code/main.cpp b/test/pkg_test_code/main.cpp index 064b2e98..ed298a4b 100644 --- a/test/pkg_test_code/main.cpp +++ b/test/pkg_test_code/main.cpp @@ -5,7 +5,6 @@ for Sustainable Energy, LLC. See the top-level NOTICE for additional details. All rights reserved. SPDX-License-Identifier: BSD-3-Clause */ - #include UNITS_LIB_HEADER #include