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

Quiet postgres (#107)

Browse Source 
* set cxx_std_20 only for libclio

* Be explicit with requiring ExternalProject

* Specify Ubuntu 20.04's cmake version exactly

* quiet postgres install step
This commit is contained in:
Michael Legleux
2022-03-01 12:03:21 -08:00
committed by GitHub
parent a8b4c1f0c6
commit 06e8c87033
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMake/deps/Postgres.cmake
View File

@@ -9,7 +9,8 @@ ExternalProject_Add(postgres
CONFIGURE_COMMAND ./configure --prefix ${POSTGRES_INSTALL_DIR} --without-readline --verbose CONFIGURE_COMMAND ./configure --prefix ${POSTGRES_INSTALL_DIR} --without-readline --verbose
BUILD_COMMAND ${CMAKE_COMMAND} -E env --unset=MAKELEVEL make VERBOSE=${CMAKE_VERBOSE_MAKEFILE} -j32 BUILD_COMMAND ${CMAKE_COMMAND} -E env --unset=MAKELEVEL make VERBOSE=${CMAKE_VERBOSE_MAKEFILE} -j32
BUILD_IN_SOURCE 1 BUILD_IN_SOURCE 1
INSTALL_COMMAND ${CMAKE_COMMAND} -E env make install INSTALL_COMMAND ${CMAKE_COMMAND} -E env make -s --no-print-directory install
UPDATE_COMMAND ""
BUILD_BYPRODUCTS BUILD_BYPRODUCTS
${POSTGRES_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}pq${CMAKE_STATIC_LIBRARY_SUFFIX}} ${POSTGRES_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}pq${CMAKE_STATIC_LIBRARY_SUFFIX}}
${POSTGRES_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}pgcommon${CMAKE_STATIC_LIBRARY_SUFFIX}} ${POSTGRES_INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}pgcommon${CMAKE_STATIC_LIBRARY_SUFFIX}}

4
CMake/settings.cmake
View File

@@ -1,5 +1 @@
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing -Wall -Werror -Wno-dangling-else") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-narrowing -Wall -Werror -Wno-dangling-else")

8
CMakeLists.txt
View File

@@ -1,9 +1,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16.3)
project(clio VERSION 0.1.0) project(clio VERSION 0.1.0)
set(CMAKE_CXX_STANDARD 20)
option(BUILD_TESTS "Build tests" TRUE) option(BUILD_TESTS "Build tests" TRUE)
option(VERBOSE "Verbose build" TRUE) option(VERBOSE "Verbose build" TRUE)
@@ -13,13 +11,11 @@ if(VERBOSE)
endif() endif()
add_library(clio) add_library(clio)
target_compile_features(clio PUBLIC cxx_std_20)
target_include_directories(clio PUBLIC src) target_include_directories(clio PUBLIC src)
include(FetchContent) include(FetchContent)
if(${CMAKE_VERSION} VERSION_LESS "3.20.0")
include(ExternalProject) include(ExternalProject)
endif()
include(CMake/settings.cmake) include(CMake/settings.cmake)
include(CMake/deps/rippled.cmake) include(CMake/deps/rippled.cmake)
include(CMake/deps/Boost.cmake) include(CMake/deps/Boost.cmake)