ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2025-12-06 01:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

build improvements

Browse Source
This commit is contained in:
CJ Cobb
2021-01-13 11:06:26 -05:00
parent 4360d4b219
commit 26c5fe9207
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
deps/Postgres.cmake vendored
View File

@@ -21,7 +21,7 @@ if(NOT PostgreSQL_FOUND)
UPDATE_COMMAND ""
BUILD_IN_SOURCE 1
INSTALL_COMMAND ""
BUILD_BYPRODUCTS <BINARY_DIR>/src/interfaces/libpq/${ep_lib_prefix}pq.so
BUILD_BYPRODUCTS <BINARY_DIR>/src/interfaces/libpq/${CMAKE_SHARED_LIBRARY_PREFIX}pq.so
)
@@ -29,7 +29,8 @@ if(NOT PostgreSQL_FOUND)
ExternalProject_Get_Property (postgres_src SOURCE_DIR)
ExternalProject_Get_Property (postgres_src BINARY_DIR)
set (postgres_src_SOURCE_DIR "${SOURCE_DIR}")
file (MAKE_DIRECTORY ${postgres_src_SOURCE_DIR})
file (MAKE_DIRECTORY ${postgres_src_SOURCE_DIR}/src/include)
file (MAKE_DIRECTORY ${postgres_src_SOURCE_DIR}/src/interfaces/libpq)
list(APPEND INCLUDE_DIRS ${SOURCE_DIR}/src/include)
list(APPEND INCLUDE_DIRS ${SOURCE_DIR}/src/interfaces/libpq)
@@ -37,14 +38,14 @@ if(NOT PostgreSQL_FOUND)
set_target_properties (postgres PROPERTIES
IMPORTED_LOCATION
${BINARY_DIR}/src/interfaces/libpq/${ep_lib_prefix}pq.so
${BINARY_DIR}/src/interfaces/libpq/${CMAKE_SHARED_LIBRARY_PREFIX}pq.so
INTERFACE_INCLUDE_DIRECTORIES
"${INCLUDE_DIRS}")
add_dependencies(postgres postgres_src)
file(TO_CMAKE_PATH "${postgres_src_SOURCE_DIR}" postgres_src_SOURCE_DIR)
target_link_libraries(reporting INTERFACE postgres)
target_link_libraries(reporting PUBLIC postgres)
else()
message("Found system installed Postgres via find_libary")