blob: 4eaa56607f53aec93b5e3e4ee93bcb75ef8dd3a2 (
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
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1efecf8..198f429 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,9 +85,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")
@@ -188,11 +196,10 @@ 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)
+ set(pg_FOUND true)
+ target_link_libraries(${PROJECT_NAME} PRIVATE PostgreSQL::PostgreSQL)
set(DROGON_SOURCES ${DROGON_SOURCES}
orm_lib/src/postgresql_impl/PostgreSQLResultImpl.cc)
if(LIBPQ_BATCH_MODE)
@@ -211,8 +224,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)
if(MySQL_FOUND)
|
