Skip to content
Permalink
Browse files

More ninja changes

  • Loading branch information
NathanW2 committed May 24, 2016
1 parent 7dcef00 commit 3f4250fedacb81d8d7718adf49f3caa6ffd1d909
Showing with 6 additions and 4 deletions.
  1. +4 −4 CMakeLists.txt
  2. +2 −0 cmake_templates/qgsconfig.h.in
@@ -396,9 +396,9 @@ IF (PEDANTIC)
MESSAGE (STATUS "Pedantic compiler settings enabled")
IF(MSVC)
SET(_warnings "")
IF (NOT USING_NMAKE)
IF (NOT USING_NMAKE AND NOT USING_NINJA)
SET(_warnings "${_warnings} /W4" )
ENDIF (NOT USING_NMAKE)
ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)

# disable warnings
SET(_warnings "${_warnings} /wd4100 ") # unused formal parameters
@@ -505,10 +505,10 @@ IF (WIN32)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)

IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
IF (NOT USING_NMAKE)
IF (NOT USING_NMAKE AND NOT USING_NINJA)
MESSAGE (STATUS "Generating browse files")
ADD_DEFINITIONS( /FR )
ENDIF (NOT USING_NMAKE)
ENDIF (NOT USING_NMAKE AND NOT USING_NINJA)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

IF (INSTALL_DEPS)
@@ -40,6 +40,8 @@

#cmakedefine USING_NMAKE

#cmakedefine USING_NINJA

#cmakedefine HAVE_POSTGRESQL

#cmakedefine HAVE_ORACLE

0 comments on commit 3f4250f

Please sign in to comment.
You can’t perform that action at this time.