sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

temporary fix for #8575 (building app as DLL is more involved and requires a CORE/GUI/APP_EXPORT macro dance...)

Browse Source
This commit is contained in:
Juergen E. Fischer 2013-09-05 14:36:35 +02:00
parent 618b58b05d
commit 2c2d6757dd
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/CMakeLists.txt
View File

@ -1,5 +1,4 @@
SET(QGIS_APP_SRCS SET(QGIS_APP_SRCS
main.cpp
qgisapp.cpp qgisapp.cpp
qgisappinterface.cpp qgisappinterface.cpp
qgisappstylesheet.cpp qgisappstylesheet.cpp
@ -452,13 +451,17 @@ ENDIF (POSTGRES_FOUND)
############# #############
IF (ANDROID) IF (ANDROID)
ADD_LIBRARY(${QGIS_APP_NAME} SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS}) ADD_LIBRARY(${QGIS_APP_NAME} SHARED main.cpp ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ELSE (ANDROID) ELSE (ANDROID)
ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS}) ADD_EXECUTABLE(${QGIS_APP_NAME} MACOSX_BUNDLE WIN32 main.cpp ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${IMAGE_RCC_SRCS} ${TEST_RCC_SRCS})
ENDIF (ANDROID) ENDIF (ANDROID)
# shared library used by tests - TODO: use it also for qgis executable? # shared library used by tests - TODO: use it also for qgis executable?
ADD_LIBRARY(qgis_app SHARED ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS}) ADD_LIBRARY(qgis_app STATIC ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} ${QGIS_APP_HDRS} ${QGIS_APP_MOC_HDRS} ${IMAGE_RCC_SRCS})
if(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
SET_TARGET_PROPERTIES(qgis_app PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
ENDIF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} TARGET_LINK_LIBRARIES(${QGIS_APP_NAME}
${QWT_LIBRARY} ${QWT_LIBRARY}

2
src/app/qgisapp.cpp
View File

@ -8864,12 +8864,14 @@ void QgisApp::keyPressEvent( QKeyEvent * e )
{ {
stopRendering(); stopRendering();
} }
#if 0
#if defined(Q_OS_WIN)&& defined(QGISDEBUG) #if defined(Q_OS_WIN)&& defined(QGISDEBUG)
else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier ) else if ( e->key() == Qt::Key_Backslash && e->modifiers() & Qt::ControlModifier )
{ {
extern LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo ); extern LONG WINAPI qgisCrashDump( struct _EXCEPTION_POINTERS *ExceptionInfo );
qgisCrashDump( 0 ); qgisCrashDump( 0 );
} }
#endif
#endif #endif
else else
{ {

4
tests/src/app/CMakeLists.txt
View File

@ -74,6 +74,10 @@ MACRO (ADD_QGIS_TEST testname testsrc)
qgis_gui qgis_gui
qgis_analysis qgis_analysis
qgis_app) qgis_app)
IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
TARGET_LINK_LIBRARIES(qgis_${testname} DbgHelp)
ENDIF(WIN32)
ADD_TEST(qgis_${testname} ${CMAKE_CURRENT_BINARY_DIR}/../../../output/bin/qgis_${testname}) ADD_TEST(qgis_${testname} ${CMAKE_CURRENT_BINARY_DIR}/../../../output/bin/qgis_${testname})
#SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES #SET_TARGET_PROPERTIES(qgis_${testname} PROPERTIES
# INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR} # INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}