Skip to content

Commit e755cc8

Browse files
committed
fixup! fixup! fixup! fixup! Modernize CMake scripts
1 parent a7bb739 commit e755cc8

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/builds.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ jobs:
101101
-DCMAKE_INSTALL_PREFIX=local \
102102
-DBUILD_SHARED_LIBS=${{ matrix.shared == 'dynamic' && 'TRUE' || 'FALSE' }} \
103103
-DLIBTCODFOV_TESTS=ON \
104-
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=\${PROJECT_BINARY_DIR}/bin \
105-
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=\${PROJECT_BINARY_DIR}/bin \
106104
-Wdev \
107105
${{ matrix.cmake_extra_args }}
108106
- name: CMake build
@@ -169,8 +167,6 @@ jobs:
169167
-DCMAKE_CXX_FLAGS="--coverage" \
170168
-DCMAKE_C_FLAGS="--coverage" \
171169
-DLIBTCODFOV_TESTS=ON \
172-
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=\${PROJECT_BINARY_DIR}/bin \
173-
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=\${PROJECT_BINARY_DIR}/bin \
174170
-Wdev
175171
- name: CMake build
176172
run: |

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "")
3939
set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE STRING "")
4040
set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE STRING "")
4141

42+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib" CACHE STRING "")
43+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" CACHE STRING "")
44+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin" CACHE STRING "")
45+
4246
add_subdirectory(src)
4347

4448
if(LIBTCODFOV_TESTS)

0 commit comments

Comments
 (0)