Browse Source

Properly handle CMake options that are enabled but not "ON"

Contributes to CURA-2787
Arjen Hiemstra 8 years ago
parent
commit
8a77dd66fc
2 changed files with 4 additions and 1 deletions
  1. 3 0
      CMakeLists.txt
  2. 1 1
      cura/CuraVersion.py.in

+ 3 - 0
CMakeLists.txt

@@ -11,6 +11,9 @@ add_custom_target(tests)
 add_custom_command(TARGET tests POST_BUILD COMMAND "PYTHONPATH=${CMAKE_SOURCE_DIR}/../Uranium/:${CMAKE_SOURCE_DIR}" ${PYTHON_EXECUTABLE} -m pytest -r a --junitxml=${CMAKE_BINARY_DIR}/junit.xml ${CMAKE_SOURCE_DIR} || exit 0)
 
 option(CURA_DEBUGMODE "Enable debug dialog and other debug features" OFF)
+if(CURA_DEBUGMODE)
+    set(_cura_debugmode "ON")
+endif()
 
 set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
 set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")

+ 1 - 1
cura/CuraVersion.py.in

@@ -3,4 +3,4 @@
 
 CuraVersion = "@CURA_VERSION@"
 CuraBuildType = "@CURA_BUILDTYPE@"
-CuraDebugMode = True if "@CURA_DEBUGMODE@" == "ON" else False
+CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False