Skip to content

Commit 9ba5324

Browse files
authoredJan 8, 2018
Merge branch 'master' into work_duplicategeom
2 parents 5e7865c + 2b8143a commit 9ba5324

File tree

789 files changed

+23065
-29786
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

789 files changed

+23065
-29786
lines changed
 

‎.ci/travis/linux/docker-build-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ echo "travis_fold:end:cmake"
5858
#######
5959
# Build
6060
#######
61-
echo "travis_fold:start:ninja-build.1"
61+
# echo "travis_fold:start:ninja-build.1"
6262
echo "${bold}Building QGIS...${endbold}"
6363
${CTEST_BUILD_COMMAND}
64-
echo "travis_fold:end:ninja-build.1"
64+
# echo "travis_fold:end:ninja-build.1"
6565

6666
# Temporarily uncomment to debug ccache issues
6767
# echo "travis_fold:start:ccache-debug"

‎CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,9 @@ ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
462462

463463
IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
464464
MESSAGE (STATUS "Debug output enabled")
465-
ADD_DEFINITIONS(-DQGISDEBUG=1)
465+
SET(QGISDEBUG TRUE)
466+
ELSE (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
467+
SET(QGISDEBUG FALSE)
466468
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
467469

468470
IF(MSVC)

0 commit comments

Comments
 (0)
Please sign in to comment.