Skip to content

Build: Add error for missing server includedir #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
iyerr3 wants to merge 2 commits into from
Closed

Build: Add error for missing server includedir #102

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b74709d
Build: Add error for missing server includedir
iyerr3 Feb 15, 2017
41ef041
Remove extra newlines
iyerr3 Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/ports/postgres/cmake/FindPostgreSQL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ if(${PKG_NAME}_PG_CONFIG)
OUTPUT_VARIABLE ${PKG_NAME}_SERVER_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)

execute_process(COMMAND ${${PKG_NAME}_PG_CONFIG} --includedir
OUTPUT_VARIABLE ${PKG_NAME}_CLIENT_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
Expand All @@ -97,7 +96,7 @@ if(${PKG_NAME}_PG_CONFIG AND ${PKG_NAME}_SERVER_INCLUDE_DIR)
set(${PKG_NAME}_VERSION_MAJOR 0)
set(${PKG_NAME}_VERSION_MINOR 0)
set(${PKG_NAME}_VERSION_PATCH 0)

set(CONFIG_FILE ${${PKG_NAME}_SERVER_INCLUDE_DIR}/pg_config.h)

if(EXISTS ${CONFIG_FILE})
Expand All @@ -112,7 +111,6 @@ if(${PKG_NAME}_PG_CONFIG AND ${PKG_NAME}_SERVER_INCLUDE_DIR)
else(${CMAKE_COMPILER_IS_GNUCC})
file(READ ${CONFIG_FILE} _PG_CONFIG_HEADER_CONTENTS)
endif(${CMAKE_COMPILER_IS_GNUCC})


# Get PACKAGE_NAME
if (_PG_CONFIG_HEADER_CONTENTS MATCHES "#define PACKAGE_NAME \".*\"")
Expand Down Expand Up @@ -159,6 +157,10 @@ if(${PKG_NAME}_PG_CONFIG AND ${PKG_NAME}_SERVER_INCLUDE_DIR)
endif(_PG_CONFIG_HEADER_CONTENTS MATCHES "#define ${_PG_CONFIG_VERSION_MACRO} ([0-9]+).*")

endif(${PKG_NAME}_VERSION_NUM MATCHES "^[0-9]+$")
else(EXISTS ${CONFIG_FILE})
message(FATAL_ERROR "Found pg_config (\"${${PKG_NAME}_PG_CONFIG}\"), "
"but pg_config.h file not present in the "
"server include dir (${${PKG_NAME}_SERVER_INCLUDE_DIR}).")
endif(EXISTS ${CONFIG_FILE})

if(_PACKAGE_NAME STREQUAL "${_NEEDED_PG_CONFIG_PACKAGE_NAME}")
Expand Down