Skip to content

Commit a16a018

Browse files
committed
Fix real issue in action.
1 parent a2c8cd8 commit a16a018

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: sudo apt-get install -y uuid-dev
3939

4040
- name: Configure CMake
41-
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -Dflow-core_BUILD_TESTS=ON -Dflow-code_BUILD_BENCHMARKS=ON
41+
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -Dflow-core_BUILD_TESTS=ON -Dflow-core_BUILD_BENCHMARKS=ON
4242

4343
- name: Build
4444
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --parallel 10

CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ endif()
2020
# Options
2121
# -----------------------------------------------------------------------------
2222

23-
option(flow-core_BUILD_TESTS "Build tests (gtest)" OFF)
24-
option(flow-core_BUILD_BENCHMARKS "Build benchmarks (googlebenchmark)" OFF)
25-
option(flow-core_BUILD_TOOLS "Build tools" OFF)
26-
option(flow-core_INSTALL "Add installation targets" OFF)
23+
option(${PROJECT_NAME}_BUILD_TESTS "Build tests (gtest)" OFF)
24+
option(${PROJECT_NAME}_BUILD_BENCHMARKS "Build benchmarks (googlebenchmark)" OFF)
25+
option(${PROJECT_NAME}_BUILD_TOOLS "Build tools" OFF)
26+
option(${PROJECT_NAME}_INSTALL "Add installation targets" OFF)
2727

2828
# -----------------------------------------------------------------------------
2929
# Dependencies
@@ -44,10 +44,10 @@ set_target_properties(zipper PROPERTIES
4444
# Library
4545
# -----------------------------------------------------------------------------
4646

47-
set(flow-core_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/include")
48-
file(GLOB flow-core_HEADERS "${flow-core_HEADERS_DIR}/flow/core/*.hpp")
47+
set(${PROJECT_NAME}_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/include")
48+
file(GLOB ${PROJECT_NAME}_HEADERS "${${PROJECT_NAME}_HEADERS_DIR}/flow/core/*.hpp")
4949
file(GLOB thread-pool_HEADERS "${thread-pool_SOURCE_DIR}/include/*.hpp")
50-
list(APPEND ${flow-core_HEADERS} ${thread-pool_HEADERS})
50+
list(APPEND ${${PROJECT_NAME}_HEADERS} ${thread-pool_HEADERS})
5151

5252
add_library(${PROJECT_NAME} SHARED
5353
src/Connection.cpp
@@ -61,7 +61,7 @@ add_library(${PROJECT_NAME} SHARED
6161
src/TypeConversion.cpp
6262
src/UUID.cpp
6363

64-
${flow-core_HEADERS}
64+
${${PROJECT_NAME}_HEADERS}
6565
)
6666

6767
add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
@@ -107,11 +107,11 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
107107
# Install
108108
# -----------------------------------------------------------------------------
109109

110-
if(flow-core_INSTALL)
110+
if(${PROJECT_NAME}_INSTALL)
111111
set(export_destination "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
112112
set(export_targets ${PROJECT_NAME})
113113

114-
if (NOT flow-core_USE_EXTERNAL_JSON)
114+
if (NOT ${PROJECT_NAME}_USE_EXTERNAL_JSON)
115115
list(APPEND export_targets nlohmann_json)
116116
endif()
117117

@@ -150,7 +150,7 @@ endif()
150150
# Tests
151151
# -----------------------------------------------------------------------------
152152

153-
if (flow-core_BUILD_TESTS)
153+
if (${PROJECT_NAME}_BUILD_TESTS)
154154
enable_testing()
155155
add_subdirectory(tests)
156156
endif()
@@ -159,14 +159,14 @@ endif()
159159
# Benchmarks
160160
# -----------------------------------------------------------------------------
161161

162-
if (flow-core_BUILD_BENCHMARKS)
162+
if (${PROJECT_NAME}_BUILD_BENCHMARKS)
163163
add_subdirectory(benchmarks)
164164
endif()
165165

166166
# -----------------------------------------------------------------------------
167167
# Tools
168168
# -----------------------------------------------------------------------------
169169

170-
if (flow-core_BUILD_TOOLS)
170+
if (${PROJECT_NAME}_BUILD_TOOLS)
171171
add_subdirectory(tools)
172172
endif()

0 commit comments

Comments
 (0)