Skip to content

Commit b3f1f4d

Browse files
author
jef
committedApr 6, 2009

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed
 

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ IF (WITH_SPATIALITE)
5757
IF(WITH_INTERNAL_SPATIALITE)
5858
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
5959
SET(HAVE_SPATIALITE TRUE)
60-
IF(WIN32)
60+
IF(WIN32 OR APPLE)
6161
FIND_PACKAGE(Iconv REQUIRED)
62-
ENDIF(WIN32)
62+
ENDIF(WIN32 OR APPLE)
6363
ENDIF (WITH_INTERNAL_SPATIALITE)
6464
ENDIF (WITH_SPATIALITE)
6565

‎cmake/FindIconv.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# searching for the same item do nothing.
1414
FIND_PATH(ICONV_INCLUDE_DIR iconv.h
1515
"$ENV{LIB_DIR}/include"
16+
/usr/local/include
17+
/usr/include
1618
#mingw
1719
c:/msys/local/include
1820
NO_DEFAULT_PATH
@@ -21,6 +23,8 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
2123

2224
FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS
2325
"$ENV{LIB_DIR}/lib"
26+
/usr/local/lib
27+
/usr/lib
2428
#mingw
2529
c:/msys/local/lib
2630
NO_DEFAULT_PATH

‎src/core/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,10 @@ SET(QGIS_CORE_SRCS
110110
)
111111

112112
IF (WITH_INTERNAL_SPATIALITE)
113-
IF (WIN32)
113+
IF (WIN32 OR APPLE)
114114
INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
115+
ENDIF (WIN32 OR APPLE)
116+
IF (WIN32)
115117
ADD_DEFINITIONS(-DDLL_EXPORT)
116118
IF (MSVC)
117119
ADD_DEFINITIONS("-DSQLITE_API=__declspec(dllexport)")
@@ -294,9 +296,9 @@ TARGET_LINK_LIBRARIES(qgis_core
294296
)
295297

296298
IF (WITH_INTERNAL_SPATIALITE)
297-
IF (WIN32)
299+
IF (WIN32 OR APPLE)
298300
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
299-
ENDIF (WIN32)
301+
ENDIF (WIN32 OR APPLE)
300302
ELSE (WITH_INTERNAL_SPATIALITE)
301303
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
302304
ENDIF (WITH_INTERNAL_SPATIALITE)

0 commit comments

Comments
 (0)
Please sign in to comment.