- fixes PgSQL CMakeLists.txt to enable conda build on Windows (#1457)

This commit is contained in:
Paolo Tosco
2017-06-29 19:31:41 +01:00
committed by Greg Landrum
parent 8784a9e0cf
commit eec17536fb

View File

@@ -13,6 +13,9 @@ add_definitions(-DUSE_BUILTIN_POPCOUNT)
endif(RDK_OPTIMIZE_NATIVE)
set(EXTENSION rdkit)
if(NOT DEFINED PostgreSQL_LIBRARY_DIRS)
find_package(PostgreSQL REQUIRED)
endif(NOT DEFINED PostgreSQL_LIBRARY_DIRS)
include_directories(${PostgreSQL_INCLUDE_DIRS})
if(WIN32)
include_directories(${PostgreSQL_INCLUDE_DIR}/server/port/win32)
@@ -89,6 +92,14 @@ if(RDK_BUILD_AVALON_SUPPORT)
set(pgRDKitLibList "${pgRDKitLibList}AvalonLib;avalon_clib;")
endif(RDK_BUILD_AVALON_SUPPORT)
if(RDK_BUILD_INCHI_SUPPORT)
if(NOT DEFINED INCHI_LIBRARIES)
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/Modules/")
if(NOT DEFINED RDKit_RELEASENAME)
include(RDKitUtils)
endif(NOT DEFINED RDKit_RELEASENAME)
find_package(Inchi)
endif(NOT DEFINED INCHI_LIBRARIES)
set(inchiRegress "inchi")
set(pgRDKitLibList "${pgRDKitLibList}RDInchiLib;${INCHI_LIBRARIES};")
endif(RDK_BUILD_INCHI_SUPPORT)
@@ -172,7 +183,11 @@ string(REPLACE " " ";" tokList ${PG_EXTVERSION})
list(GET tokList -1 PG_EXTVERSION)
string(REGEX REPLACE "'" "" PG_EXTVERSION ${PG_EXTVERSION})
if(MSVC)
set(PG_RDKIT_LIB_SRC "${CMAKE_BUILD_TYPE}\\${PG_RDKIT_LIB_SRC}")
if(${CMAKE_GENERATOR} STREQUAL "NMake Makefiles")
set(PG_RDKIT_LIB_SRC "${PG_RDKIT_LIB_SRC}")
else(${CMAKE_GENERATOR} STREQUAL "NMake Makefiles")
set(PG_RDKIT_LIB_SRC "${CMAKE_BUILD_TYPE}\\${PG_RDKIT_LIB_SRC}")
endif(${CMAKE_GENERATOR} STREQUAL "NMake Makefiles")
endif(MSVC)
if(${PostgreSQL_VERSION_STRING} VERSION_LESS 9.5)
set(RDKIT_PG_BFP_GIST_FETCH "")