Navigation Menu

Skip to content

Commit

Permalink
Merge pull request #7957 from m-kuhn/noSilentDisable
Browse files Browse the repository at this point in the history
Do not silently disable cmake options
  • Loading branch information
m-kuhn committed Sep 19, 2018
2 parents 0fc16d6 + 71ec68b commit b4ab101
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CMakeLists.txt
Expand Up @@ -108,8 +108,12 @@ IF(WITH_CORE)
IF (NOT WITH_GUI)
SET (HAVE_GUI FALSE) # used in qgsconfig.h
# force value of some options
SET(WITH_DESKTOP FALSE)
SET(WITH_CUSTOM_WIDGETS FALSE)
IF(WITH_DESKTOP)
MESSAGE(FATAL_ERROR "Desktop cannot be built without gui. Enable WITH_GUI or disable WITH_DESKTOP.")
ENDIF(WITH_DESKTOP)
IF(WITH_CUSTOM_WIDGETS)
MESSAGE(FATAL_ERROR "Custom widgets cannot be built without gui. Enable WITH_GUI or disable WITH_CUSTOM_WIDGETS.")
ENDIF(WITH_CUSTOM_WIDGETS)
ELSE ()
SET (HAVE_GUI TRUE) # used in qgsconfig.h
ENDIF()
Expand Down

0 comments on commit b4ab101

Please sign in to comment.