Merge pull request #19535 from mckellyln/build_u22

ghalliday · web-flow · commit 9532ee552599 · 2025-03-07T09:57:57.000Z
HPCC-33460 Build on ubuntu 22.04 with CMake version 3.31+

Reviewed-by: Gordon Smith &lt;GordonJSmith@gmail.com&gt;
Merged-by: Gavin Halliday &lt;ghalliday@hpccsystems.com&gt;
diff --git a/docs/PT_BR/CMakeLists.txt b/docs/PT_BR/CMakeLists.txt
@@ -28,7 +28,6 @@
 #
 
 
-cmake_minimum_required(VERSION 2.8)
 PROJECT(docs_pt_br)
 
 #define_property(GLOBAL PROPERTY DOC_TARGETS BRIEF_DOCS "docs_pt_br" FULL_DOCS "docs_pt_br")
@@ -98,4 +97,4 @@ add_subdirectory(ContainerizedHPCC)
 
 
 #GET_PROPERTY(_targets GLOBAL PROPERTY DOC_TARGETS)
-#add_custom_target(docs_en_us ALL DEPENDS ${_targets})
+#add_custom_target(docs_en_us ALL DEPENDS ${_targets})
diff --git a/system/security/plugins/htpasswdSecurity/initfiles/CMakeLists.txt b/system/security/plugins/htpasswdSecurity/initfiles/CMakeLists.txt
@@ -14,7 +14,6 @@
 #    limitations under the License.
 ################################################################################
 
-cmake_minimum_required(VERSION 2.8)
 PROJECT(initfiles)
 
 ADD_SUBDIRECTORY(componentfiles)

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`#`
`29`	`29`
`30`	`30`
`31`		`-cmake_minimum_required(VERSION 2.8)`
`32`	`31`	`PROJECT(docs_pt_br)`
`33`	`32`
`34`	`33`	`#define_property(GLOBAL PROPERTY DOC_TARGETS BRIEF_DOCS "docs_pt_br" FULL_DOCS "docs_pt_br")`
`@@ -98,4 +97,4 @@ add_subdirectory(ContainerizedHPCC)`
`98`	`97`
`99`	`98`
`100`	`99`	`#GET_PROPERTY(_targets GLOBAL PROPERTY DOC_TARGETS)`
`101`		`-#add_custom_target(docs_en_us ALL DEPENDS ${_targets})`
	`100`	`+#add_custom_target(docs_en_us ALL DEPENDS ${_targets})`