Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Sep 1, 2023
1 parent 5589a48 commit 32e51f0
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ jobs:
- checkout
- run: *setup_units
- run: *run_installer_tests

unitsInstall-alt:
docker:
- image: helics/buildenv:builder
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
8 changes: 5 additions & 3 deletions test/find_package_tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ project(units-find-package-test)

include(CTest)

if (NOT UNITS_TARGET)
set(UNITS_TARGET units)
if(NOT UNITS_TARGET)
set(UNITS_TARGET units)
endif()

# Test the HELICS CMake package config
Expand All @@ -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 UNITS_LIB_HEADER="${UNITS_TARGET}/units.hpp")
target_compile_definitions(
shared-library-test-exe 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")
Expand Down
1 change: 0 additions & 1 deletion test/pkg_test_code/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <iostream>
Expand Down

0 comments on commit 32e51f0

Please sign in to comment.