From b74709d4169c9774249fa198b2ca92cad57df063 Mon Sep 17 00:00:00 2001 From: Rahul Iyer Date: Wed, 15 Feb 2017 14:27:47 -0800 Subject: [PATCH 1/2] Build: Add error for missing server includedir JIRA: MADLIB-1065 Missing server headers is a common error with new contributors. This leads to a non-related error with CMake. This commit fixes that by explicitly asking user to check server includedir. Closes #102 --- src/ports/postgres/cmake/FindPostgreSQL.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ports/postgres/cmake/FindPostgreSQL.cmake b/src/ports/postgres/cmake/FindPostgreSQL.cmake index eda277b09..9476c972f 100644 --- a/src/ports/postgres/cmake/FindPostgreSQL.cmake +++ b/src/ports/postgres/cmake/FindPostgreSQL.cmake @@ -97,7 +97,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}) @@ -112,7 +112,7 @@ 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 \".*\"") @@ -159,6 +159,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}") From 41ef041f23e1ebdfcfee8cb622a0fb4e3eef84fa Mon Sep 17 00:00:00 2001 From: Rahul Iyer Date: Wed, 15 Feb 2017 14:32:20 -0800 Subject: [PATCH 2/2] Remove extra newlines --- src/ports/postgres/cmake/FindPostgreSQL.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/ports/postgres/cmake/FindPostgreSQL.cmake b/src/ports/postgres/cmake/FindPostgreSQL.cmake index 9476c972f..0f9663d14 100644 --- a/src/ports/postgres/cmake/FindPostgreSQL.cmake +++ b/src/ports/postgres/cmake/FindPostgreSQL.cmake @@ -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 @@ -113,7 +112,6 @@ if(${PKG_NAME}_PG_CONFIG AND ${PKG_NAME}_SERVER_INCLUDE_DIR) 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 \".*\"") string(REGEX REPLACE