Skip to content

Commit 79e38b9

Browse files
committed
Add system name to target
Signed-off-by: Darshan Sen <raisinten@gmail.com>
1 parent 41da37f commit 79e38b9

File tree

8 files changed

+23
-16
lines changed

8 files changed

+23
-16
lines changed

CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ option(BENONI_TESTS "Build the Benoni tests" OFF)
99
option(BENONI_EXAMPLES "Build the Benoni examples" OFF)
1010
option(BENONI_INSTALL "Install Benoni" ON)
1111

12+
string(TOLOWER ${CMAKE_SYSTEM_NAME} LOWER_SYSTEM_NAME)
13+
set(BENONI_TARGET ${PROJECT_NAME}_${LOWER_SYSTEM_NAME})
14+
1215
if(APPLE)
1316
add_subdirectory(src/apple)
1417
elseif(WIN32)
@@ -18,12 +21,12 @@ elseif(UNIX)
1821
add_subdirectory(src/linux)
1922
endif()
2023

21-
set_target_properties(benoni PROPERTIES PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/include/benoni/http.h)
24+
set_target_properties(${BENONI_TARGET} PROPERTIES PUBLIC_HEADER ${PROJECT_SOURCE_DIR}/include/benoni/http.h)
2225

2326
if(BENONI_INSTALL)
2427
include(GNUInstallDirs)
2528

26-
install(TARGETS benoni
29+
install(TARGETS ${BENONI_TARGET}
2730
EXPORT benoni
2831
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
2932
COMPONENT benoni

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ example: .always
2222
$(EXAMPLE)
2323

2424
test: .always
25-
$(CTEST) -C Debug --test-dir build --parallel
25+
$(CTEST) -C Debug --test-dir build --parallel --output-on-failure
2626

2727
# For NMake, which doesn't support .PHONY
2828
.always:

examples/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
add_executable(http_example http_example.cc)
22

3-
target_link_libraries(http_example PRIVATE benoni)
3+
target_link_libraries(http_example PRIVATE ${BENONI_TARGET})

src/apple/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
add_library(benoni STATIC http.mm)
1+
add_library(${BENONI_TARGET} STATIC http.mm)
22

3-
target_compile_options(benoni PUBLIC "-fobjc-arc")
3+
target_compile_options(${BENONI_TARGET} PUBLIC "-fobjc-arc")
44

5-
target_include_directories(benoni PUBLIC
5+
target_include_directories(${BENONI_TARGET} PUBLIC
66
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
77
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>)
88

9-
target_link_libraries(benoni PUBLIC "-framework Foundation")
9+
target_link_libraries(${BENONI_TARGET} PUBLIC "-framework Foundation")

src/linux/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
add_library(benoni STATIC http.cc)
1+
add_library(${BENONI_TARGET} STATIC http.cc)
22

3-
target_include_directories(benoni PUBLIC
3+
target_include_directories(${BENONI_TARGET} PUBLIC
44
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
55
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>)
66

7-
target_link_libraries(benoni PUBLIC libsoup)
7+
target_link_libraries(${BENONI_TARGET} PUBLIC libsoup)

src/win32/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
add_library(benoni STATIC http.cc)
1+
add_library(${BENONI_TARGET} STATIC http.cc)
22

3-
target_include_directories(benoni PUBLIC
3+
target_include_directories(${BENONI_TARGET} PUBLIC
44
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
55
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/include>)
66

7-
target_link_libraries(benoni PUBLIC "Winhttp.lib")
7+
target_link_libraries(${BENONI_TARGET} PUBLIC "Winhttp.lib")

test/packaging/project/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ add_subdirectory(
88
"${CMAKE_CURRENT_BINARY_DIR}/benoni_build")
99

1010
add_executable(project project.cc)
11-
target_link_libraries(project PRIVATE benoni)
11+
12+
string(TOLOWER ${CMAKE_SYSTEM_NAME} LOWER_SYSTEM_NAME)
13+
set(BENONI_TARGET benoni_${LOWER_SYSTEM_NAME})
14+
15+
target_link_libraries(project PRIVATE ${BENONI_TARGET})

test/unit/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_executable(postman_echo_get postman-echo-get.cc)
22

3-
target_link_libraries(postman_echo_get PRIVATE benoni)
3+
target_link_libraries(postman_echo_get PRIVATE ${BENONI_TARGET})
44

55
add_test(NAME postman_echo_get COMMAND $<TARGET_FILE:postman_echo_get>)

0 commit comments

Comments
 (0)