File tree Expand file tree Collapse file tree 3 files changed +11
-5
lines changed Expand file tree Collapse file tree 3 files changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -57,9 +57,9 @@ IF (WITH_SPATIALITE)
57
57
IF (WITH_INTERNAL_SPATIALITE )
58
58
SET (SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR} /src/core/spatialite/headers )
59
59
SET (HAVE_SPATIALITE TRUE )
60
- IF (WIN32 )
60
+ IF (WIN32 OR APPLE )
61
61
FIND_PACKAGE (Iconv REQUIRED )
62
- ENDIF (WIN32 )
62
+ ENDIF (WIN32 OR APPLE )
63
63
ENDIF (WITH_INTERNAL_SPATIALITE )
64
64
ENDIF (WITH_SPATIALITE )
65
65
Original file line number Diff line number Diff line change 13
13
# searching for the same item do nothing.
14
14
FIND_PATH (ICONV_INCLUDE_DIR iconv.h
15
15
"$ENV{LIB_DIR} /include"
16
+ /usr/local/include
17
+ /usr/include
16
18
#mingw
17
19
c:/msys/local/include
18
20
NO_DEFAULT_PATH
@@ -21,6 +23,8 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
21
23
22
24
FIND_LIBRARY (ICONV_LIBRARY NAMES iconv PATHS
23
25
"$ENV{LIB_DIR} /lib"
26
+ /usr/local/lib
27
+ /usr/lib
24
28
#mingw
25
29
c:/msys/local/lib
26
30
NO_DEFAULT_PATH
Original file line number Diff line number Diff line change @@ -110,8 +110,10 @@ SET(QGIS_CORE_SRCS
110
110
)
111
111
112
112
IF (WITH_INTERNAL_SPATIALITE )
113
- IF (WIN32 )
113
+ IF (WIN32 OR APPLE )
114
114
INCLUDE_DIRECTORIES (${ICONV_INCLUDE_DIR} )
115
+ ENDIF (WIN32 OR APPLE )
116
+ IF (WIN32 )
115
117
ADD_DEFINITIONS (-DDLL_EXPORT )
116
118
IF (MSVC )
117
119
ADD_DEFINITIONS ("-DSQLITE_API=__declspec(dllexport)" )
@@ -294,9 +296,9 @@ TARGET_LINK_LIBRARIES(qgis_core
294
296
)
295
297
296
298
IF (WITH_INTERNAL_SPATIALITE )
297
- IF (WIN32 )
299
+ IF (WIN32 OR APPLE )
298
300
TARGET_LINK_LIBRARIES (qgis_core ${ICONV_LIBRARY} )
299
- ENDIF (WIN32 )
301
+ ENDIF (WIN32 OR APPLE )
300
302
ELSE (WITH_INTERNAL_SPATIALITE )
301
303
TARGET_LINK_LIBRARIES (qgis_core ${SQLITE3_LIBRARY} )
302
304
ENDIF (WITH_INTERNAL_SPATIALITE )
You can’t perform that action at this time.
0 commit comments