diff options
| -rw-r--r-- | modules/FindPostgreSQL.cmake | 18 | ||||
| -rw-r--r-- | modules/FindX11.cmake | 4 |
2 files changed, 4 insertions, 18 deletions
diff --git a/modules/FindPostgreSQL.cmake b/modules/FindPostgreSQL.cmake index d72aae8c..49acf7be 100644 --- a/modules/FindPostgreSQL.cmake +++ b/modules/FindPostgreSQL.cmake @@ -22,25 +22,15 @@ find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h /usr/local/include/pgsql ) -find_library(POSTGRESQL_LIBRARIES NAMES pq - PATHS - /usr/lib - /usr/local/lib -) +find_library(POSTGRESQL_LIBRARIES NAMES pq) if(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) set(POSTGRESQL_FOUND TRUE) endif(POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) -if(POSTGRESQL_FOUND) - if (NOT PostgreSQL_FIND_QUIETLY) - message(STATUS "Found PostgreSQL: ${POSTGRESQL_INCLUDE_DIR}, ${POSTGRESQL_LIBRARIES}") - endif(NOT PostgreSQL_FIND_QUIETLY) -else(POSTGRESQL_FOUND) - if (PostgreSQL_FIND_REQUIRED) - message(FATAL_ERROR "PostgreSQL not found.") - endif(PostgreSQL_FIND_REQUIRED) -endif(POSTGRESQL_FOUND) +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PostgreSQL DEFAULT_MSG + POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES ) mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) diff --git a/modules/FindX11.cmake b/modules/FindX11.cmake index 79fc2a61..e641e04f 100644 --- a/modules/FindX11.cmake +++ b/modules/FindX11.cmake @@ -48,21 +48,17 @@ IF (UNIX) /usr/pkg/xorg/include /usr/pkg/include /usr/X11R6/include - /usr/local/include /usr/include/X11 /usr/openwin/include /usr/openwin/share/include /opt/graphics/OpenGL/include - /usr/include ) SET(X11_LIB_SEARCH_PATH /usr/pkg/xorg/lib /usr/pkg/lib /usr/X11R6/lib - /usr/local/lib /usr/openwin/lib - /usr/lib ) FIND_PATH(X11_X11_INCLUDE_PATH X11/X.h ${X11_INC_SEARCH_PATH}) |