Skip to content

Commit 7b7b039

Browse files
committed
Modernize CMakeLists
1 parent dba65f2 commit 7b7b039

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Build
3737
run: cmake --build build --config Release --parallel -- -quiet
3838
- name: Test
39-
run: ctest --test-dir build --parallel
39+
run: ctest --test-dir build --build-config Release --parallel
4040
cmake-macos-arm64:
4141
runs-on: macos-14
4242
timeout-minutes: 15
@@ -47,7 +47,7 @@ jobs:
4747
- name: Build
4848
run: cmake --build build --config Release --parallel -- -quiet
4949
- name: Test
50-
run: ctest --test-dir build --parallel
50+
run: ctest --test-dir build --build-config Release --parallel
5151
cmake-windows-x86:
5252
runs-on: windows-2019
5353
timeout-minutes: 15
@@ -58,7 +58,7 @@ jobs:
5858
- name: Build
5959
run: cmake --build build --config Release --parallel
6060
- name: Test
61-
run: ctest --test-dir build --parallel
61+
run: ctest --test-dir build --build-config Release --parallel
6262
cmake-windows-x64:
6363
runs-on: windows-2019
6464
timeout-minutes: 15
@@ -69,7 +69,7 @@ jobs:
6969
- name: Build
7070
run: cmake --build build --config Release --parallel
7171
- name: Test
72-
run: ctest --test-dir build --parallel
72+
run: ctest --test-dir build --build-config Release --parallel
7373
cmake-windows-arm64:
7474
runs-on: windows-2019
7575
timeout-minutes: 15

CMakeLists.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,61 +65,61 @@ IF(FP16_BUILD_TESTS)
6565
CXX_STANDARD_REQUIRED YES
6666
CXX_EXTENSIONS YES)
6767
TARGET_INCLUDE_DIRECTORIES(ieee-to-fp32-bits-test PRIVATE test)
68-
TARGET_LINK_LIBRARIES(ieee-to-fp32-bits-test fp16 gtest gtest_main)
69-
ADD_TEST(ieee-to-fp32-bits ieee-to-fp32-bits-test)
68+
TARGET_LINK_LIBRARIES(ieee-to-fp32-bits-test PRIVATE fp16 gtest gtest_main)
69+
ADD_TEST(NAME ieee-to-fp32-bits COMMAND ieee-to-fp32-bits-test)
7070

7171
ADD_EXECUTABLE(ieee-to-fp32-value-test test/ieee-to-fp32-value.cc test/tables.cc)
7272
SET_TARGET_PROPERTIES(ieee-to-fp32-value-test PROPERTIES
7373
CXX_STANDARD 11
7474
CXX_STANDARD_REQUIRED YES
7575
CXX_EXTENSIONS YES)
7676
TARGET_INCLUDE_DIRECTORIES(ieee-to-fp32-value-test PRIVATE test)
77-
TARGET_LINK_LIBRARIES(ieee-to-fp32-value-test fp16 gtest gtest_main)
78-
ADD_TEST(ieee-to-fp32-value ieee-to-fp32-value-test)
77+
TARGET_LINK_LIBRARIES(ieee-to-fp32-value-test PRIVATE fp16 gtest gtest_main)
78+
ADD_TEST(NAME ieee-to-fp32-value COMMAND ieee-to-fp32-value-test)
7979

8080
ADD_EXECUTABLE(ieee-from-fp32-value-test test/ieee-from-fp32-value.cc test/tables.cc)
8181
SET_TARGET_PROPERTIES(ieee-from-fp32-value-test PROPERTIES
8282
CXX_STANDARD 11
8383
CXX_STANDARD_REQUIRED YES
8484
CXX_EXTENSIONS YES)
8585
TARGET_INCLUDE_DIRECTORIES(ieee-from-fp32-value-test PRIVATE test)
86-
TARGET_LINK_LIBRARIES(ieee-from-fp32-value-test fp16 gtest gtest_main)
87-
ADD_TEST(ieee-from-fp32-value ieee-from-fp32-value-test)
86+
TARGET_LINK_LIBRARIES(ieee-from-fp32-value-test PRIVATE fp16 gtest gtest_main)
87+
ADD_TEST(NAME ieee-from-fp32-value COMMAND ieee-from-fp32-value-test)
8888

8989
ADD_EXECUTABLE(alt-to-fp32-bits-test test/alt-to-fp32-bits.cc test/tables.cc)
9090
SET_TARGET_PROPERTIES(alt-to-fp32-bits-test PROPERTIES
9191
CXX_STANDARD 11
9292
CXX_STANDARD_REQUIRED YES
9393
CXX_EXTENSIONS YES)
9494
TARGET_INCLUDE_DIRECTORIES(alt-to-fp32-bits-test PRIVATE test)
95-
TARGET_LINK_LIBRARIES(alt-to-fp32-bits-test fp16 gtest gtest_main)
96-
ADD_TEST(alt-to-fp32-bits alt-to-fp32-bits-test)
95+
TARGET_LINK_LIBRARIES(alt-to-fp32-bits-test PRIVATE fp16 gtest gtest_main)
96+
ADD_TEST(NAME alt-to-fp32-bits COMMAND alt-to-fp32-bits-test)
9797

9898
ADD_EXECUTABLE(alt-to-fp32-value-test test/alt-to-fp32-value.cc test/tables.cc)
9999
SET_TARGET_PROPERTIES(alt-to-fp32-value-test PROPERTIES
100100
CXX_STANDARD 11
101101
CXX_STANDARD_REQUIRED YES
102102
CXX_EXTENSIONS YES)
103103
TARGET_INCLUDE_DIRECTORIES(alt-to-fp32-value-test PRIVATE test)
104-
TARGET_LINK_LIBRARIES(alt-to-fp32-value-test fp16 gtest gtest_main)
105-
ADD_TEST(alt-to-fp32-value alt-to-fp32-value-test)
104+
TARGET_LINK_LIBRARIES(alt-to-fp32-value-test PRIVATE fp16 gtest gtest_main)
105+
ADD_TEST(NAME alt-to-fp32-value COMMAND alt-to-fp32-value-test)
106106

107107
ADD_EXECUTABLE(alt-from-fp32-value-test test/alt-from-fp32-value.cc test/tables.cc)
108108
SET_TARGET_PROPERTIES(alt-from-fp32-value-test PROPERTIES
109109
CXX_STANDARD 11
110110
CXX_STANDARD_REQUIRED YES
111111
CXX_EXTENSIONS YES)
112112
TARGET_INCLUDE_DIRECTORIES(alt-from-fp32-value-test PRIVATE test)
113-
TARGET_LINK_LIBRARIES(alt-from-fp32-value-test fp16 gtest gtest_main)
114-
ADD_TEST(alt-from-fp32-value alt-from-fp32-value-test)
113+
TARGET_LINK_LIBRARIES(alt-from-fp32-value-test PRIVATE fp16 gtest gtest_main)
114+
ADD_TEST(NAME alt-from-fp32-value COMMAND alt-from-fp32-value-test)
115115

116116
ADD_EXECUTABLE(bitcasts-test test/bitcasts.cc)
117117
SET_TARGET_PROPERTIES(bitcasts-test PROPERTIES
118118
CXX_STANDARD 11
119119
CXX_STANDARD_REQUIRED YES
120120
CXX_EXTENSIONS YES)
121-
TARGET_LINK_LIBRARIES(bitcasts-test fp16 gtest gtest_main)
122-
ADD_TEST(bitcasts bitcasts-test)
121+
TARGET_LINK_LIBRARIES(bitcasts-test PRIVATE fp16 gtest gtest_main)
122+
ADD_TEST(NAME bitcasts COMMAND bitcasts-test)
123123
ENDIF()
124124

125125
IF(FP16_BUILD_BENCHMARKS)
@@ -139,14 +139,14 @@ IF(FP16_BUILD_BENCHMARKS)
139139
CXX_EXTENSIONS YES)
140140
TARGET_COMPILE_DEFINITIONS(ieee-element-bench PRIVATE "FP16_COMPARATIVE_BENCHMARKS=$<BOOL:FP16_BUILD_COMPARATIVE_BENCHMARKS>")
141141
TARGET_INCLUDE_DIRECTORIES(ieee-element-bench PRIVATE "${PROJECT_SOURCE_DIR}")
142-
TARGET_LINK_LIBRARIES(ieee-element-bench fp16 benchmark)
142+
TARGET_LINK_LIBRARIES(ieee-element-bench PRIVATE fp16 benchmark)
143143

144144
ADD_EXECUTABLE(alt-element-bench bench/alt-element.cc)
145145
SET_TARGET_PROPERTIES(alt-element-bench PROPERTIES
146146
CXX_STANDARD 11
147147
CXX_STANDARD_REQUIRED YES
148148
CXX_EXTENSIONS YES)
149-
TARGET_LINK_LIBRARIES(alt-element-bench fp16 benchmark)
149+
TARGET_LINK_LIBRARIES(alt-element-bench PRIVATE fp16 benchmark)
150150

151151
ADD_EXECUTABLE(from-ieee-array-bench bench/from-ieee-array.cc)
152152
SET_TARGET_PROPERTIES(from-ieee-array-bench PROPERTIES
@@ -155,14 +155,14 @@ IF(FP16_BUILD_BENCHMARKS)
155155
CXX_EXTENSIONS YES)
156156
TARGET_COMPILE_DEFINITIONS(from-ieee-array-bench PRIVATE "FP16_COMPARATIVE_BENCHMARKS=$<BOOL:FP16_BUILD_COMPARATIVE_BENCHMARKS>")
157157
TARGET_INCLUDE_DIRECTORIES(from-ieee-array-bench PRIVATE "${PROJECT_SOURCE_DIR}")
158-
TARGET_LINK_LIBRARIES(from-ieee-array-bench fp16 benchmark)
158+
TARGET_LINK_LIBRARIES(from-ieee-array-bench PRIVATE fp16 benchmark)
159159

160160
ADD_EXECUTABLE(from-alt-array-bench bench/from-alt-array.cc)
161161
SET_TARGET_PROPERTIES(from-alt-array-bench PROPERTIES
162162
CXX_STANDARD 11
163163
CXX_STANDARD_REQUIRED YES
164164
CXX_EXTENSIONS YES)
165-
TARGET_LINK_LIBRARIES(from-alt-array-bench fp16 benchmark)
165+
TARGET_LINK_LIBRARIES(from-alt-array-bench PRIVATE fp16 benchmark)
166166

167167
ADD_EXECUTABLE(to-ieee-array-bench bench/to-ieee-array.cc)
168168
SET_TARGET_PROPERTIES(to-ieee-array-bench PROPERTIES
@@ -171,12 +171,12 @@ IF(FP16_BUILD_BENCHMARKS)
171171
CXX_EXTENSIONS YES)
172172
TARGET_COMPILE_DEFINITIONS(to-ieee-array-bench PRIVATE "FP16_COMPARATIVE_BENCHMARKS=$<BOOL:FP16_BUILD_COMPARATIVE_BENCHMARKS>")
173173
TARGET_INCLUDE_DIRECTORIES(to-ieee-array-bench PRIVATE "${PROJECT_SOURCE_DIR}")
174-
TARGET_LINK_LIBRARIES(to-ieee-array-bench fp16 benchmark)
174+
TARGET_LINK_LIBRARIES(to-ieee-array-bench PRIVATE fp16 benchmark)
175175

176176
ADD_EXECUTABLE(to-alt-array-bench bench/to-alt-array.cc)
177177
SET_TARGET_PROPERTIES(to-alt-array-bench PROPERTIES
178178
CXX_STANDARD 11
179179
CXX_STANDARD_REQUIRED YES
180180
CXX_EXTENSIONS YES)
181-
TARGET_LINK_LIBRARIES(to-alt-array-bench fp16 benchmark)
181+
TARGET_LINK_LIBRARIES(to-alt-array-bench PRIVATE fp16 benchmark)
182182
ENDIF()

0 commit comments

Comments
 (0)