Merge pull request #464 from dakcarto/nmake-with-jom_1

dakcarto · dakcarto · commit 4d1158438893 · 2013-03-18T11:36:31.000-07:00
Fix for #7289, add CMake option to enable building with Qt jom (nmake) on Windows
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,6 +125,11 @@ SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")
 # if set to other directory than expected
 MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH)
 
+IF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")
+  # following variable is also used in qgsconfig.h
+  SET (USING_NMAKE TRUE)
+ENDIF (MSVC AND CMAKE_GENERATOR MATCHES "NMake")
+
 #############################################################
 # check if lexer and parser are not missing
 # http://www.mail-archive.com/cmake@cmake.org/msg02861.html
@@ -295,7 +300,9 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
 IF (PEDANTIC)
   MESSAGE (STATUS "Pedantic compiler settings enabled")
   IF(MSVC)
-    ADD_DEFINITIONS( /W4 )
+    IF (NOT USING_NMAKE)
+      ADD_DEFINITIONS( /W4 )
+    ENDIF (NOT USING_NMAKE)
 
     # disable warnings
     ADD_DEFINITIONS( /wd4100 )  # unused formal parameters
@@ -372,8 +379,10 @@ IF (WIN32)
     ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
 
     IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-      MESSAGE (STATUS "Generating browse files")
-      ADD_DEFINITIONS( /FR )
+      IF (NOT USING_NMAKE)
+        MESSAGE (STATUS "Generating browse files")
+        ADD_DEFINITIONS( /FR )
+      ENDIF (NOT USING_NMAKE)
     ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
 
     IF (INSTALL_DEPS)
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -32,6 +32,8 @@
 //used by Mac to find system Qt plugins when bundle is run from build directory
 #define QTPLUGINSDIR "${QT_PLUGINS_DIR}"
 
+#cmakedefine USING_NMAKE
+
 #cmakedefine HAVE_POSTGRESQL
 
 #cmakedefine HAVE_SPATIALITE
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -118,7 +118,7 @@ void QgsApplication::init( QString customConfigPath )
   {
     // we run from source directory - not installed to destination (specified prefix)
     ABISYM( mPrefixPath ) = QString(); // set invalid path
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && ! defined(USING_NMAKE)
     setPluginPath( ABISYM( mBuildOutputPath ) + "/" + QString( QGIS_PLUGIN_SUBDIR ) + "/" + ABISYM( mCfgIntDir ) );
 #else
     setPluginPath( ABISYM( mBuildOutputPath ) + "/" + QString( QGIS_PLUGIN_SUBDIR ) );
diff --git a/src/crssync/CMakeLists.txt b/src/crssync/CMakeLists.txt
@@ -12,17 +12,17 @@ TARGET_LINK_LIBRARIES(crssync
   ${GDAL_LIBRARY}
 )
 
-IF(MSVC)
+IF(MSVC AND NOT USING_NMAKE)
 	ADD_CUSTOM_TARGET(synccrsdb
 		COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/crssync.exe
 		DEPENDS crssync
 	)
-ELSE(MSVC)
+ELSE(MSVC AND NOT USING_NMAKE)
 	ADD_CUSTOM_TARGET(synccrsdb
 		COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync
 		DEPENDS crssync
 	)
-ENDIF(MSVC)
+ENDIF(MSVC AND NOT USING_NMAKE)
 
 INSTALL(CODE "MESSAGE(\"Installing crssync ...\")")
 INSTALL(TARGETS crssync RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})
diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -41,14 +41,18 @@ int main( int argc, char ** argv )
   {
     context = argv[1];
   }
+
+  if ( !QgsApplication::isRunningFromBuildDir() )
+  {
 #if defined(Q_WS_MACX)
-  // If we're on Mac, we have the resource library way above us...
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
+    // If we're on Mac, we have the resource library way above us...
+    a.setPkgDataPath( QgsApplication::prefixPath() + "/../../../../" + QString( QGIS_DATA_SUBDIR ) );
 #elif defined(Q_WS_WIN)
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/" QGIS_DATA_SUBDIR );
+    a.setPkgDataPath( QgsApplication::prefixPath() + "/" QGIS_DATA_SUBDIR );
 #else
-  a.setPkgDataPath( QgsApplication::prefixPath() + "/../" QGIS_DATA_SUBDIR );
+    a.setPkgDataPath( QgsApplication::prefixPath() + "/../" QGIS_DATA_SUBDIR );
 #endif
+  }
 
   QString i18nPath = QgsApplication::i18nPath();
   if ( myTranslationCode.isEmpty() )

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ void QgsApplication::init( QString customConfigPath )`
`118`	`118`	`{`
`119`	`119`	`// we run from source directory - not installed to destination (specified prefix)`
`120`	`120`	`ABISYM( mPrefixPath ) = QString(); // set invalid path`
`121`		`-#ifdef _MSC_VER`
	`121`	`+#if defined(_MSC_VER) && ! defined(USING_NMAKE)`
`122`	`122`	`setPluginPath( ABISYM( mBuildOutputPath ) + "/" + QString( QGIS_PLUGIN_SUBDIR ) + "/" + ABISYM( mCfgIntDir ) );`
`123`	`123`	`#else`
`124`	`124`	`setPluginPath( ABISYM( mBuildOutputPath ) + "/" + QString( QGIS_PLUGIN_SUBDIR ) );`
Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,17 @@ TARGET_LINK_LIBRARIES(crssync`
`12`	`12`	`${GDAL_LIBRARY}`
`13`	`13`	`)`
`14`	`14`
`15`		`-IF(MSVC)`
	`15`	`+IF(MSVC AND NOT USING_NMAKE)`
`16`	`16`	`ADD_CUSTOM_TARGET(synccrsdb`
`17`	`17`	`COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/crssync.exe`
`18`	`18`	`DEPENDS crssync`
`19`	`19`	`)`
`20`		`-ELSE(MSVC)`
	`20`	`+ELSE(MSVC AND NOT USING_NMAKE)`
`21`	`21`	`ADD_CUSTOM_TARGET(synccrsdb`
`22`	`22`	`COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/crssync`
`23`	`23`	`DEPENDS crssync`
`24`	`24`	`)`
`25`		`-ENDIF(MSVC)`
	`25`	`+ENDIF(MSVC AND NOT USING_NMAKE)`
`26`	`26`
`27`	`27`	`INSTALL(CODE "MESSAGE(\"Installing crssync ...\")")`
`28`	`28`	`INSTALL(TARGETS crssync RUNTIME DESTINATION ${QGIS_LIBEXEC_DIR})`