to squash

Author: bindea-cristian

cmake/Modules/PackageUtils.cmake

@@ -24,6 +24,7 @@ function(add_subdirectories_with_options base_dir output_dir prefix)
 	file(GLOB CHILDREN RELATIVE ${base_dir} ${base_dir}/*)
 
 	foreach(child ${CHILDREN})
+		message("")
 		if(IS_DIRECTORY ${base_dir}/${child})
 			string(TOUPPER ${child} CHILD_UPPER)
 			set(ENABLE_CHILD_VAR "${prefix}_${CHILD_UPPER}")
@@ -50,40 +51,27 @@ function(add_subdirectories_with_options base_dir output_dir prefix)
 				endif()
 			else()
 				message(STATUS "Skipping: ${child}")
+				message(STATUS "To enable this package use -D${ENABLE_CHILD_VAR}=ON")
 			endif()
 		endif()
 	endforeach()
 endfunction()
 
 function(enable_all base_dir enable prefix)
-	cmake_parse_arguments(
-		EA
-		"QUIET"
-		""
-		""
-		${ARGN}
-	)
 	file(GLOB CHILDREN RELATIVE ${base_dir} ${base_dir}/*)
 	foreach(child ${CHILDREN})
 		if(IS_DIRECTORY ${base_dir}/${child})
 			string(TOUPPER ${child} CHILD_UPPER)
 			set(ENABLE_CHILD_VAR "${prefix}_${CHILD_UPPER}")
-
-			if(EA_QUIET)
-				# Quiet behavior
-				if(NOT DEFINED ${ENABLE_CHILD_VAR})
-					set(${ENABLE_CHILD_VAR} ${enable} CACHE BOOL "Enable ${prefix} ${child}")
-				endif()
-			else()
-				# Default behavior
+			if(NOT DEFINED ${ENABLE_CHILD_VAR})
 				set(${ENABLE_CHILD_VAR} ${enable} CACHE BOOL "Enable ${prefix} ${child}" FORCE)
 			endif()
 		endif()
 	endforeach()
 endfunction()
 
 function(enable_all_packages base_dir enable)
-	enable_all(${base_dir} ${enable} "ENABLE_PACKAGE" ${ARGN})
+	enable_all(${base_dir} ${enable} "ENABLE_PACKAGE")
 endfunction()
 
 function(add_packages base_dir output_dir)

packages/CMakeLists.txt

@@ -35,13 +35,20 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 endif()
 include(PackageUtils)
 
-set(ENABLE_PACKAGE_TEST-PLUGINS OFF CACHE BOOL "Enable test plugins package" FORCE)
-set(ENABLE_PACKAGE_EXTPROC OFF CACHE BOOL "Enable extproc package" FORCE)
 if(DISABLE_ALL_PACKAGES MATCHES ON)
-	enable_all_packages(${CMAKE_CURRENT_SOURCE_DIR} OFF)
-	message(STATUS "DISABLE_ALL_PACKAGES is set.")
+enable_all_packages(${CMAKE_CURRENT_SOURCE_DIR} OFF)
+message(STATUS "DISABLE_ALL_PACKAGES is set.")
 elseif(ENABLE_ALL_PACKAGES MATCHES ON)
-	enable_all_packages(${CMAKE_CURRENT_SOURCE_DIR} ON)
-	message(STATUS "ENABLE_ALL_PACKAGES is set.")
+enable_all_packages(${CMAKE_CURRENT_SOURCE_DIR} ON)
+message(STATUS "ENABLE_ALL_PACKAGES is set.")
+endif()
+
+# Default disabled packages
+if(NOT DEFINED ENABLE_PACKAGE_TEST-PLUGINS)
+	set(ENABLE_PACKAGE_TEST-PLUGINS ON CACHE BOOL "Enable test plugins package" FORCE)
+endif()
+
+if(NOT DEFINED ENABLE_PACKAGE_EXTPROC)
+	set(ENABLE_PACKAGE_EXTPROC ON CACHE BOOL "Enable extproc package" FORCE)
 endif()
 add_packages(${CMAKE_CURRENT_SOURCE_DIR} ${SCOPY_PACKAGE_BUILD_PATH})