Permalink
Browse files

CMAKE tweaks

  • Loading branch information...
1 parent 0ad1555 commit 37c4252cbd1f3c49c4163582383760a31cac1393 @szekerest szekerest committed Mar 28, 2013
Showing with 4 additions and 4 deletions.
  1. +1 −1 CMakeLists.txt
  2. +1 −1 cmake/FindFCGI.cmake
  3. +1 −1 cmake/FindFreetype.cmake
  4. +1 −1 cmake/FindGEOS.cmake
View
@@ -677,7 +677,7 @@ status_optional_feature("KML output" "${USE_KML}")
status_optional_feature("Z+M point coordinate support" "${USE_POINT_Z_M}")
status_optional_feature("XML Mapfile support" "${USE_XMLMAPFILE}")
if(WIN32)
-status_optional_component("Oracle Spatial as Plugin" "${USE_ORACLE_PLUGIN}")
+status_optional_feature("Oracle Spatial as Plugin" "${USE_ORACLE_PLUGIN}")
endif(WIN32)
message(STATUS " * Mapscripts")
@@ -2,7 +2,7 @@
find_path(FCGI_INCLUDE_DIR NAMES fastcgi.h)
# Look for the library.
-find_library(FCGI_LIBRARY NAMES fcgi)
+find_library(FCGI_LIBRARY NAMES fcgi libfcgi)
set(FCGI_INCLUDE_DIRS ${FCGI_INCLUDE_DIR})
set(FCGI_LIBRARIES ${FCGI_LIBRARY})
@@ -67,7 +67,7 @@ FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
PATH_SUFFIXES freetype2
)
-set(FREETYPE_NAMES ${FREETYPE_NAMES} freetype libfreetype freetype219 freetype241MT_D)
+set(FREETYPE_NAMES ${FREETYPE_NAMES} freetype libfreetype freetype219 freetype239 freetype241MT_D freetype2411)
FIND_LIBRARY(FREETYPE_LIBRARY
NAMES ${FREETYPE_NAMES}
HINTS
@@ -18,7 +18,7 @@ find_path( GEOS_INCLUDE_DIR geos_c.h
SUFFIXES geos)
# Find GEOS C library:
-find_library( GEOS_LIBRARY NAMES geos_c
+find_library( GEOS_LIBRARY NAMES geos_c geos_c_i
PATHS
/usr/lib64
/usr/lib

0 comments on commit 37c4252

Please sign in to comment.