[irods#7548] CMake: Consolidate calls to cmake_minimum_required

korydraughn · Mar 7, 2024 · 8677339 · 8677339
1 parent 7811ad3
commit 8677339
Show file tree

Hide file tree

Showing 38 changed files with 5 additions and 106 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
 # target_link_libraries for object targets
 # CURL::libcurl target
+# install() NAMELINK_COMPONENT argument
+
 list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
 include(RequireOutOfSourceBuild)
 

diff --git a/cmake/Modules/ObjectTargetHelpers.cmake b/cmake/Modules/ObjectTargetHelpers.cmake
@@ -47,6 +47,9 @@ functions for working with these targets.
 
 include_guard(GLOBAL)
 
+cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
+# target_link_libraries for object targets
+
 cmake_policy(PUSH)
 cmake_policy(SET CMP0054 NEW)
 cmake_policy(SET CMP0051 NEW)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-# install() NAMELINK_COMPONENT argument
-
 # create irods_common target first, as it's needed in core
 add_library(
   irods_common

diff --git a/lib/administration/resource/CMakeLists.txt b/lib/administration/resource/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 foreach(variant IN ITEMS client server)
   set(target_name "irods_resource_administration_${variant}")
 

diff --git a/lib/administration/ticket/CMakeLists.txt b/lib/administration/ticket/CMakeLists.txt
@@ -1,4 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
 foreach(variant IN ITEMS client server)
     set(target_name "irods_ticket_administration_${variant}")
 

diff --git a/lib/administration/user/CMakeLists.txt b/lib/administration/user/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_user_administration_common
   OBJECT

diff --git a/lib/administration/zone/CMakeLists.txt b/lib/administration/zone/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 foreach(variant IN ITEMS client server)
   set(target_name "irods_zone_administration_${variant}")
 

diff --git a/lib/api/CMakeLists.txt b/lib/api/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 foreach(variant IN ITEMS client server)
   add_library(
     irods_lib_api_${variant}

diff --git a/lib/core/CMakeLists.txt b/lib/core/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-# install() NAMELINK_COMPONENT argument
-
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/include/irods/irods_default_paths.hpp.in"
   "${CMAKE_CURRENT_BINARY_DIR}/include/irods/irods_default_paths.hpp"

diff --git a/lib/filesystem/CMakeLists.txt b/lib/filesystem/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_filesystem_path
   OBJECT

diff --git a/lib/hasher/CMakeLists.txt b/lib/hasher/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_hasher
   OBJECT

diff --git a/lib/metadata/CMakeLists.txt b/lib/metadata/CMakeLists.txt
@@ -1,5 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-
 foreach(variant IN ITEMS server client)
   add_library(
     irods_lib_metadata_${variant}

diff --git a/lib/rbudp/CMakeLists.txt b/lib/rbudp/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_rbudp
   OBJECT

diff --git a/plugins/api/CMakeLists.txt b/plugins/api/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # create phony target to build everything in plugins/api folder
 add_custom_target(all-plugins-api)
 add_dependencies(all-plugins_no_database all-plugins-api)

diff --git a/plugins/auth/CMakeLists.txt b/plugins/auth/CMakeLists.txt
@@ -1,6 +1,4 @@
 # auth plugins using 4.3.0 framework
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
 
 # create phony target to build everything in plugins/auth folder
 add_custom_target(all-plugins-auth)

diff --git a/plugins/auth_legacy/CMakeLists.txt b/plugins/auth_legacy/CMakeLists.txt
@@ -1,6 +1,4 @@
 # original auth plugins - these are required to exist to talk to older servers
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
 
 # create phony target to build everything in plugins/auth_legacy folder
 add_custom_target(all-plugins-auth_legacy)

diff --git a/plugins/database/CMakeLists.txt b/plugins/database/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # create phony target to build everything in plugins/database folder
 add_custom_target(all-plugins-database)
 add_dependencies(all-plugins all-plugins-database)

diff --git a/plugins/experimental/CMakeLists.txt b/plugins/experimental/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # create phony target to build everything in plugins/experimental folder
 add_custom_target(all-plugins-experimental)
 add_dependencies(all-plugins_no_database all-plugins-experimental)

diff --git a/plugins/microservices/CMakeLists.txt b/plugins/microservices/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 set(IRODS_MICROSERVICE_TEST_PLUGINS_BUILD OFF CACHE BOOL "Build microservice plugins designed for testing.")
 
 # create phony target to build everything in plugins/microservices folder

diff --git a/plugins/network/CMakeLists.txt b/plugins/network/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # create phony target to build everything in plugins/network folder
 add_custom_target(all-plugins-network)
 add_dependencies(all-plugins_no_database all-plugins-network)

diff --git a/plugins/resources/CMakeLists.txt b/plugins/resources/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # create phony target to build everything in plugins/resources folder
 add_custom_target(all-plugins-resources)
 add_dependencies(all-plugins_no_database all-plugins-resources)

diff --git a/plugins/resources/replication/CMakeLists.txt b/plugins/resources/replication/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_resource_plugin-replication
   MODULE

diff --git a/plugins/resources/unixfilesystem/CMakeLists.txt b/plugins/resources/unixfilesystem/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # anything being unit tested needs to be split out into an object library.
 add_library(
   irods_resource_plugin_obj-unixfilesystem

diff --git a/plugins/rule_engines/CMakeLists.txt b/plugins/rule_engines/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 # create phony target to build everything in plugins/rule_engines folder
 add_custom_target(all-plugins-rule_engines)
 add_dependencies(all-plugins_no_database all-plugins-rule_engines)

diff --git a/plugins/rule_engines/irods_rule_language/CMakeLists.txt b/plugins/rule_engines/irods_rule_language/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_rule_engine_plugin-irods_rule_language
   MODULE

diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
@@ -1,7 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-# install() NAMELINK_COMPONENT argument
-
 # create phony target to build everything in server folder
 add_custom_target(all-server)
 

diff --git a/server/api/CMakeLists.txt b/server/api/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_server_api
   OBJECT

diff --git a/server/auth/CMakeLists.txt b/server/auth/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 if (NOT PAM_LIBRARY)
   find_library(PAM_LIBRARY pam)
   if (PAM_LIBRARY)

diff --git a/server/control_plane/CMakeLists.txt b/server/control_plane/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_custom_command(
   OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/irods/"
   COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/include/irods/"

diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_server_core
   OBJECT

diff --git a/server/delay_server/CMakeLists.txt b/server/delay_server/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_executable(
   irodsDelayServer
   "${CMAKE_CURRENT_SOURCE_DIR}/src/irodsDelayServer.cpp"

diff --git a/server/drivers/CMakeLists.txt b/server/drivers/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_server_drivers
   OBJECT

diff --git a/server/harness/CMakeLists.txt b/server/harness/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 foreach(harness IN ITEMS api configuration)
   add_executable(
     irods_${harness}_test_harness

diff --git a/server/hostname_resolves_to_local_address/CMakeLists.txt b/server/hostname_resolves_to_local_address/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_executable(
   hostname_resolves_to_local_address
   "${CMAKE_CURRENT_SOURCE_DIR}/src/hostname_resolves_to_local_address.cpp"

diff --git a/server/icat/CMakeLists.txt b/server/icat/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_server_icat
   OBJECT

diff --git a/server/irods_grid/CMakeLists.txt b/server/irods_grid/CMakeLists.txt
@@ -1,8 +1,5 @@
 # irods-grid was previously part of the iCommands repo
 
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_executable(
   irods-grid
   "${CMAKE_CURRENT_SOURCE_DIR}/src/irods-grid.cpp"

diff --git a/server/main_server/CMakeLists.txt b/server/main_server/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_executable(
   irodsServer
   "${CMAKE_CURRENT_SOURCE_DIR}/src/rodsServer.cpp"

diff --git a/server/re/CMakeLists.txt b/server/re/CMakeLists.txt
@@ -1,6 +1,3 @@
-cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
-# target_link_libraries for object targets
-
 add_library(
   irods_server_re
   OBJECT