Skip to content

Commit 295f313

Browse files
authored
Rename BUILD_TRANTOR_SHARED to BUILD_SHARED_LIBS (#216)
1 parent fb81728 commit 295f313

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

.github/workflows/cmake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
working-directory: ./build
4444
run: |
4545
[[ ${{ matrix.link }} == "SHARED" ]] && shared="ON" || shared="OFF"
46-
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=on -DBUILD_TRANTOR_SHARED=$shared -DCMAKE_TOOLCHAIN_FILE="conan_paths.cmake" -DCMAKE_INSTALL_PREFIX=../install
46+
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=on -DBUILD_SHARED_LIBS=$shared -DCMAKE_TOOLCHAIN_FILE="conan_paths.cmake" -DCMAKE_INSTALL_PREFIX=../install
4747
4848
- name: Build
4949
working-directory: ${{env.GITHUB_WORKSPACE}}

CMakeLists.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ project(trantor)
33

44
option(BUILD_DOC "Build Doxygen documentation" OFF)
55
option(BUILD_C-ARES "Build C-ARES" ON)
6+
option(BUILD_SHARED_LIBS "Build trantor as a shared lib" OFF)
67

78
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/)
89

@@ -24,14 +25,13 @@ set(INSTALL_TRANTOR_CMAKE_DIR
2425
${DEF_INSTALL_TRANTOR_CMAKE_DIR}
2526
CACHE PATH "Installation directory for cmake files")
2627

27-
if(BUILD_TRANTOR_SHARED)
28-
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
28+
add_library(${PROJECT_NAME})
29+
if(BUILD_SHARED_LIBS)
2930
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
3031
"${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}" isSystemDir)
3132
if("${isSystemDir}" STREQUAL "-1")
3233
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}")
3334
endif("${isSystemDir}" STREQUAL "-1")
34-
add_library(${PROJECT_NAME} SHARED)
3535
set_target_properties(${PROJECT_NAME} PROPERTIES
3636
VERSION ${TRANTOR_VERSION}
3737
SOVERSION ${TRANTOR_MAJOR_VERSION})
@@ -42,9 +42,7 @@ if(BUILD_TRANTOR_SHARED)
4242
# exact same compiler for drogon and your app.
4343
target_compile_options(${PROJECT_NAME} PUBLIC /wd4251 /wd4275)
4444
endif()
45-
else(BUILD_TRANTOR_SHARED)
46-
add_library(${PROJECT_NAME} STATIC)
47-
endif(BUILD_TRANTOR_SHARED)
45+
endif(BUILD_SHARED_LIBS)
4846

4947
if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND CMAKE_CXX_COMPILER_ID MATCHES Clang|GNU)
5048
target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)

0 commit comments

Comments
 (0)