[QGIS Commit] r10488 - in trunk/qgis: . cmake src/core

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-04-06 14:24:57 -0400 (Mon, 06 Apr 2009)
New Revision: 10488

Modified:
   trunk/qgis/CMakeLists.txt
   trunk/qgis/cmake/FindIconv.cmake
   trunk/qgis/src/core/CMakeLists.txt
Log:
detect iconv on macosx

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2009-04-06 17:09:20 UTC (rev 10487)
+++ trunk/qgis/CMakeLists.txt	2009-04-06 18:24:57 UTC (rev 10488)
@@ -57,9 +57,9 @@
   IF(WITH_INTERNAL_SPATIALITE)
     SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
     SET(HAVE_SPATIALITE TRUE)
-    IF(WIN32)
+    IF(WIN32 OR APPLE)
       FIND_PACKAGE(Iconv REQUIRED)
-    ENDIF(WIN32)
+    ENDIF(WIN32 OR APPLE)
   ENDIF (WITH_INTERNAL_SPATIALITE)
 ENDIF (WITH_SPATIALITE)
 

Modified: trunk/qgis/cmake/FindIconv.cmake
===================================================================
--- trunk/qgis/cmake/FindIconv.cmake	2009-04-06 17:09:20 UTC (rev 10487)
+++ trunk/qgis/cmake/FindIconv.cmake	2009-04-06 18:24:57 UTC (rev 10488)
@@ -13,6 +13,8 @@
 # searching for the same item do nothing. 
 FIND_PATH(ICONV_INCLUDE_DIR iconv.h
   "$ENV{LIB_DIR}/include"
+  /usr/local/include
+  /usr/include
   #mingw
   c:/msys/local/include
   NO_DEFAULT_PATH
@@ -21,6 +23,8 @@
 
 FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS
   "$ENV{LIB_DIR}/lib"
+  /usr/local/lib
+  /usr/lib
   #mingw
   c:/msys/local/lib
   NO_DEFAULT_PATH

Modified: trunk/qgis/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/src/core/CMakeLists.txt	2009-04-06 17:09:20 UTC (rev 10487)
+++ trunk/qgis/src/core/CMakeLists.txt	2009-04-06 18:24:57 UTC (rev 10488)
@@ -110,8 +110,10 @@
   )
 
 IF (WITH_INTERNAL_SPATIALITE)
+  IF (WIN32 OR APPLE)
+    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
+  ENDIF (WIN32 OR APPLE)
   IF (WIN32)
-    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
     ADD_DEFINITIONS(-DDLL_EXPORT)
     IF (MSVC)
       ADD_DEFINITIONS("-DSQLITE_API=__declspec(dllexport)")
@@ -294,9 +296,9 @@
 )
 
 IF (WITH_INTERNAL_SPATIALITE)
-  IF (WIN32)
+  IF (WIN32 OR APPLE)
     TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
-  ENDIF (WIN32)
+  ENDIF (WIN32 OR APPLE)
 ELSE (WITH_INTERNAL_SPATIALITE)
   TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
 ENDIF (WITH_INTERNAL_SPATIALITE)