Commit 04f88ca 1 parent 0105d25 commit 04f88ca Copy full SHA for 04f88ca
File tree 1 file changed +5
-18
lines changed
1 file changed +5
-18
lines changed Original file line number Diff line number Diff line change @@ -382,8 +382,11 @@ ENDIF (POSTGRES_FOUND)
382
382
383
383
#############
384
384
SET (QGIS_APP_LIB_NAME ${QGIS_APP_NAME} _app)
385
- ADD_EXECUTABLE (${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} )
386
- ADD_LIBRARY (${QGIS_APP_LIB_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${INDEX_SRC} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} )
385
+ IF (ANDROID)
386
+ ADD_LIBRARY (${QGIS_APP_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${INDEX_SRC} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} )
387
+ ELSE (ANDROID)
388
+ ADD_EXECUTABLE (${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} )
389
+ ENDIF (ANDROID)
387
390
388
391
TARGET_LINK_LIBRARIES (${QGIS_APP_NAME}
389
392
${QWT_LIBRARY}
@@ -397,19 +400,6 @@ TARGET_LINK_LIBRARIES(${QGIS_APP_NAME}
397
400
qgis_analysis
398
401
)
399
402
400
- TARGET_LINK_LIBRARIES (${QGIS_APP_LIB_NAME}
401
- ${QWT_LIBRARY}
402
- ${QT_QTSQL_LIBRARY}
403
- ${QT_QTUITOOLS_LIBRARY}
404
- #should only be needed for win
405
- ${QT_QTMAIN_LIBRARY}
406
- ${QWTPOLAR_LIBRARY}
407
- qgis_core
408
- qgis_gui
409
- qgis_analysis
410
- )
411
-
412
-
413
403
IF ( WIN32 )
414
404
ADD_DEFINITIONS (-DQWT_DLL)
415
405
ENDIF ( WIN32 )
@@ -441,9 +431,6 @@ ENDIF(MSVC)
441
431
442
432
INSTALL (TARGETS ${QGIS_APP_NAME}
443
433
BUNDLE DESTINATION ${QGIS_INSTALL_PREFIX}
444
- RUNTIME DESTINATION ${QGIS_BIN_DIR} )
445
-
446
- INSTALL (TARGETS ${QGIS_APP_LIB_NAME}
447
434
RUNTIME DESTINATION ${QGIS_BIN_DIR}
448
435
LIBRARY DESTINATION ${QGIS_LIB_DIR}
449
436
ARCHIVE DESTINATION ${QGIS_LIB_DIR}
You can’t perform that action at this time.
0 commit comments