blob: a4128264fea167da30ed805c15445acb9796d20e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6df5dac..b79036d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,13 +5,11 @@ project(drogon)
message(STATUS "compiler: " ${CMAKE_CXX_COMPILER_ID})
include(CheckCXXSourceRuns)
check_cxx_source_runs(
- ${PROJECT_SOURCE_DIR}/cmake/tests/binary_compatibility_test.cc
- cross_compiling)
+ "int main(){return 0;}"
+ not_cross_compiling)
-if(cross_compiling)
+if(!not_cross_compiling)
set(BUILD_PROGRAMS OFF)
-else(cross_compiling)
- set(BUILD_PROGRAMS ON)
endif()
option(BUILD_CTL "Build drogon_ctl" ${BUILD_PROGRAMS})
@@ -84,9 +82,9 @@ if(WIN32)
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/third_party/mman-win32>)
endif(WIN32)
-add_subdirectory(trantor)
+find_package(Trantor CONFIG REQUIRED)
-target_link_libraries(${PROJECT_NAME} PUBLIC trantor)
+target_link_libraries(${PROJECT_NAME} PUBLIC Trantor::Trantor)
if(NOT WIN32)
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
@@ -183,11 +181,11 @@ endif(NOT WIN32)
if(BUILD_ORM)
# find postgres
- find_package(pg)
- if(pg_FOUND)
- message(STATUS "libpq inc path:" ${PG_INCLUDE_DIRS})
- message(STATUS "libpq lib:" ${PG_LIBRARIES})
- target_link_libraries(${PROJECT_NAME} PRIVATE pg_lib)
+ find_package(PostgreSQL REQUIRED)
+ if(PostgreSQL_FOUND)
+ message(STATUS "libpq inc path:" ${PostgreSQL_INCLUDE_DIRS})
+ message(STATUS "libpq lib:" ${PostgreSQL_LIBRARIES})
+ target_link_libraries(${PROJECT_NAME} PRIVATE ${PostgreSQL_LIBRARIES})
set(DROGON_SOURCES ${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
if(LIBPQ_BATCH_MODE)
@@ -206,7 +204,7 @@ if(BUILD_ORM)
set(DROGON_SOURCES ${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PgConnection.cc)
endif(libpq_supports_batch)
- endif(pg_FOUND)
+ endif(PostgreSQL_FOUND)
# Find mysql, only mariadb client liberary is supported
find_package(MySQL)
|
