Skip to content

Commit 703c283

Browse files
author
Rastislav Turanyi
committed
Propagate PkgConfig Criterion path to linkers
MacOS build was not working likely because there Criterion was not on the default path and CMake was not propagating the path it found
1 parent d75f332 commit 703c283

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ find_package(BLAS REQUIRED)
6565

6666
if(BUILD_TESTING)
6767
find_package(PkgConfig REQUIRED)
68-
pkg_check_modules(criterion REQUIRED criterion)
68+
pkg_check_modules(CRITERION REQUIRED IMPORTED_TARGET criterion)
6969
add_subdirectory(tests)
7070
endif()
7171

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if(BUILD_TESTING)
1818

1919
target_link_libraries(test_real_data ${MATH_LIBRARY})
2020
target_link_libraries(test_real_data openblas)
21-
target_link_libraries(test_real_data criterion)
21+
target_link_libraries(test_real_data PkgConfig::CRITERION)
2222

2323
target_link_libraries(test_real_data testing_utils)
2424

tests/unit_tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if(BUILD_TESTING)
1414

1515
target_link_libraries(unit_test ${MATH_LIBRARY})
1616
target_link_libraries(unit_test openblas)
17-
target_link_libraries(unit_test criterion)
17+
target_link_libraries(unit_test PkgConfig::CRITERION)
1818

1919
target_link_libraries(unit_test testing_utils)
2020

@@ -37,7 +37,7 @@ if(BUILD_TESTING)
3737

3838
target_link_libraries(test_constructors_omp ${MATH_LIBRARY})
3939
target_link_libraries(test_constructors_omp openblas)
40-
target_link_libraries(test_constructors_omp criterion)
40+
target_link_libraries(test_constructors_omp PkgConfig::CRITERION)
4141
target_link_libraries(test_constructors_omp OpenMP::OpenMP_C)
4242

4343
target_link_libraries(test_constructors_omp testing_utils)

tests/utils/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ if(BUILD_TESTING)
66

77
target_link_libraries(testing_utils ${MATH_LIBRARY})
88
target_link_libraries(testing_utils openblas)
9-
target_link_libraries(testing_utils criterion)
9+
target_link_libraries(testing_utils PkgConfig::CRITERION)
1010
endif()

0 commit comments

Comments
 (0)