Fix quixdb#228

Cloudef · Sep 29, 2017 · a1dc1e3 · a1dc1e3
1 parent 662f95b
commit a1dc1e3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/plugins/brieflz/CMakeLists.txt b/plugins/brieflz/CMakeLists.txt
@@ -2,15 +2,18 @@ include (SquashPlugin)
 
 set(BRIEFLZ_BUNDLED_MODE ON)
 set(BRIEFLZ_TEST_ENABLE TRUE)
-add_subdirectory (brieflz)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.11)
-  include_directories(${BRIEFLZ_INCLUDE_DIRS})
-  add_definitions(${BRIEFLZ_DEFINITIONS})
-endif()
 
 SQUASH_PLUGIN(
   SOURCES squash-brieflz.c
   NAME brieflz
   EMBED_TARGET brieflz
   INCLUDE_DIRS ${BRIEFLZ_INCLUDE_DIRS})
+
+if (ENABLE_BRIEFLZ)
+  add_subdirectory (brieflz)
+
+  if(CMAKE_VERSION VERSION_LESS 2.8.11)
+    include_directories(${BRIEFLZ_INCLUDE_DIRS})
+    add_definitions(${BRIEFLZ_DEFINITIONS})
+  endif()
+endif ()
diff --git a/plugins/brotli/CMakeLists.txt b/plugins/brotli/CMakeLists.txt
@@ -1,11 +1,6 @@
 include (SquashPlugin)
 
 set(BROTLI_BUNDLED_MODE ON)
-add_subdirectory(brotli)
-
-if(CMAKE_VERSION VERSION_LESS 2.8.11)
-  include_directories(${BROTLI_INCLUDE_DIRS})
-endif()
 
 SQUASH_PLUGIN(
   SOURCES squash-brotli.c
@@ -14,3 +9,11 @@ SQUASH_PLUGIN(
   C_STANDARD c99
   EMBED_TARGET ${BROTLI_LIBRARIES}
   EMBED_INCLUDE_DIRS ${BROTLI_INCLUDE_DIRS})
+
+if (ENABLE_BROTLI)
+  add_subdirectory(brotli)
+
+  if(CMAKE_VERSION VERSION_LESS 2.8.11)
+    include_directories(${BROTLI_INCLUDE_DIRS})
+  endif()
+endif ()
diff --git a/plugins/zlib-ng/CMakeLists.txt b/plugins/zlib-ng/CMakeLists.txt
@@ -8,11 +8,6 @@ function(generate_cmakein input output)
   file(WRITE "${output}" "${output_data}")
 endfunction(generate_cmakein)
 
-generate_cmakein("${CMAKE_CURRENT_SOURCE_DIR}/zlib-ng/zconf.h.in" "${CMAKE_CURRENT_BINARY_DIR}/zconf.h.cmakein")
-
-configure_file(	${CMAKE_CURRENT_BINARY_DIR}/zconf.h.cmakein
-		${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-
 ## End copied from zlib-ng
 
 include (SquashPlugin)
@@ -42,3 +37,10 @@ squash_plugin(
   EMBED_COMPILER_FLAGS
     -Wno-shift-negative-value)
 list (APPEND zlibng_sources ${libzlibng_sources})
+
+if (ENABLE_ZLIB_NG)
+  generate_cmakein("${CMAKE_CURRENT_SOURCE_DIR}/zlib-ng/zconf.h.in" "${CMAKE_CURRENT_BINARY_DIR}/zconf.h.cmakein")
+
+  configure_file(	${CMAKE_CURRENT_BINARY_DIR}/zconf.h.cmakein
+		  ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+endif ()