cmake: enable dynamic storage and cats backends per default

bareos · Feb 11, 2019 · 3db975f · 3db975f
1 parent 570d124
commit 3db975f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -153,6 +153,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
    SET(PostgreSQL_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/cats/pgsql/include)
    SET(PostgreSQL_TYPE_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/src/win32/plugins/python/include)
 
+   SET(dynamic-storage-backends OFF)
+   SET(HAVE_DYNAMIC_SD_BACKENDS 0)
+
 
 else()
    add_definitions("-D_FILE_OFFSET_BITS=64")

diff --git a/core/cmake/BareosSetVariableDefaults.cmake b/core/cmake/BareosSetVariableDefaults.cmake
@@ -290,21 +290,26 @@ ENDIF()
 
 # dynamic-cats-backends
 IF(NOT DEFINED dynamic-cats-backends)
-   SET(dynamic-cats-backends OFF)
-   SET(HAVE_DYNAMIC_CATS_BACKENDS 0)
-ELSE()
    SET(dynamic-cats-backends ON)
    SET(HAVE_DYNAMIC_CATS_BACKENDS 1)
+ELSE()
+   IF (${dynamic-cats-backends})
+     SET(HAVE_DYNAMIC_CATS_BACKENDS 1)
+   ELSE()
+     SET(HAVE_DYNAMIC_CATS_BACKENDS 0)
+   ENDIF()
 ENDIF()
 
 # dynamic-storage-backends
 IF(NOT DEFINED dynamic-storage-backends)
-   # OR (${dynamic-storage-backends}))
-   SET(dynamic-storage-backends OFF)
-   SET(HAVE_DYNAMIC_SD_BACKENDS 0)
+  SET(dynamic-storage-backends ON)
+  SET(HAVE_DYNAMIC_SD_BACKENDS 1)
 ELSE()
-   SET(dynamic-storage-backends ON)
-   SET(HAVE_DYNAMIC_SD_BACKENDS 1)
+  IF (${dynamic-storage-backends})
+    SET(HAVE_DYNAMIC_SD_BACKENDS 1)
+  ELSE()
+    SET(HAVE_DYNAMIC_SD_BACKENDS 0)
+  ENDIF()
 ENDIF()
 
 # scsi-crypto