Skip to content

Commit 1999a7a

Browse files
committed
try to fix cmake
1 parent a7937ae commit 1999a7a

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,18 @@ CPMAddPackage(
2020
GIT_TAG 0.20250114.0
2121
OPTIONS "BUILD_SHARED_LIBS OFF" "BUILD_TESTING OFF"
2222
)
23-
message(STATUS "BoringSSL source dir: ${boringssl_SOURCE_DIR}")
23+
add_subdirectory(src)
24+
add_library(ncrypto::ncrypto ALIAS ncrypto)
25+
2426
include_directories(${boringssl_SOURCE_DIR}/include)
2527

28+
29+
target_link_libraries(ncrypto PUBLIC
30+
${boringssl_BINARY_DIR}/ssl/libssl.a
31+
${boringssl_BINARY_DIR}/crypto/libcrypto.a
32+
)
33+
34+
2635
if (NCRYPTO_TESTING)
2736
CPMAddPackage(
2837
NAME GTest
@@ -36,9 +45,6 @@ if (NCRYPTO_TESTING)
3645
add_subdirectory(tests)
3746
endif()
3847

39-
add_subdirectory(src)
40-
add_library(ncrypto::ncrypto ALIAS ncrypto)
41-
4248
install(
4349
FILES include/ncrypto.h
4450
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"

cmake/ncrypto-flags.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
option(NCRYPTO_DEVELOPMENT_CHECKS "development checks (useful for debugging)" OFF)
22
option(NCRYPTO_TESTING "Build tests" ON)
33

4+
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
45
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
56
set(CMAKE_CXX_STANDARD 20)
67
set(CMAKE_CXX_STANDARD_REQUIRED ON)

src/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
add_library(ncrypto ncrypto.cpp engine.cpp)
2-
target_link_libraries(ncrypto boringssl)
3-
2+
add_dependencies(ncrypto crypto ssl)
43
target_include_directories(ncrypto
54
PUBLIC
65
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
76
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
87
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
98
$<BUILD_INTERFACE:${boringssl_SOURCE_DIR}/include>
109
)
10+
11+
target_link_libraries(ncrypto PUBLIC
12+
${boringssl_BINARY_DIR}/ssl/libssl.a
13+
${boringssl_BINARY_DIR}/crypto/libcrypto.a
14+
)

tests/CMakeLists.txt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
include(GoogleTest)
2-
include(CTest)
32
add_executable(basic basic.cpp)
4-
target_link_libraries(
5-
basic
6-
GTest::gtest_main
7-
)
8-
target_link_libraries(basic ncrypto)
9-
add_test(basic_test basic)
3+
target_link_libraries(basic PRIVATE ncrypto GTest::gtest_main)
104
gtest_discover_tests(basic)
5+
if(MSVC OR MINGW)
6+
target_compile_definitions(basic PRIVATE _CRT_SECURE_NO_WARNINGS)
7+
endif()

0 commit comments

Comments
 (0)