Merge pull request #1053 from MathiasPaulin/cmake-version-318

[cmake] request version 3.18
STORM-IRIT · Jun 28, 2023 · fe7d934 · fe7d934
2 parents 88aca60 + 0b8bc7c
commit fe7d934
Show file tree

Hide file tree

Showing 41 changed files with 71 additions and 100 deletions.
diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml
@@ -172,6 +172,7 @@ jobs:
           echo "${{ env.ext-dir }}/bin" >> $GITHUB_PATH
           echo "${{ env.ext-dir }}/glbinding" >> $GITHUB_PATH
           echo "${{ env.ext-dir }}/globjects" >> $GITHUB_PATH
+          echo "${{ env.ext-dir }}/cpplocate" >> $GITHUB_PATH
       - name: Prepare directories
         run: |
           mkdir -p install/

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 
 # ------------------------------------------------------------------------------
 # Policies and global parameters for CMake

diff --git a/cmake/ExternalInclude.cmake b/cmake/ExternalInclude.cmake
@@ -1,17 +1,4 @@
 #set the compile definition for current directory (i.e. externals)
-if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-        string(REGEX REPLACE "/W[0-4]" "/W4" EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    else()
-        set(EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-    endif()
-else()
-    set(EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
-endif()
-
-# if we are in a radium process, use radium specific option, else use cmake option.
-set(EXTERNAL_INSTALL_MESSAGE ${CMAKE_INSTALL_MESSAGE})
-
 set(RADIUM_EXTERNAL_CMAKE_OPTIONS
     -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
     -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}
@@ -21,17 +8,35 @@ set(RADIUM_EXTERNAL_CMAKE_OPTIONS
     -DCMAKE_INSTALL_MESSAGE=${EXTERNAL_INSTALL_MESSAGE}
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-    -DCMAKE_CXX_FLAGS=${EXTERNAL_CMAKE_CXX_FLAGS}
-    -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
-    -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
-    -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
     -DCMAKE_SHARED_LINKER_FLAGS=${CMAKE_SHARED_LINKER_FLAGS}
     -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
     -DCMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}
     -DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
     -DCMAKE_MACOSX_RPATH=TRUE
     --no-warn-unused-cli
 )
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+        string(REGEX REPLACE "/W[0-4]" "/W4" EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    else()
+        set(EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+    endif()
+    set(RADIUM_EXTERNAL_CMAKE_OPTIONS ${RADIUM_EXTERNAL_CMAKE_OPTIONS}
+                                      -DCMAKE_CXX_FLAGS=${EXTERNAL_CMAKE_CXX_FLAGS}
+    )
+else()
+    set(EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w")
+    set(RADIUM_EXTERNAL_CMAKE_OPTIONS
+        ${RADIUM_EXTERNAL_CMAKE_OPTIONS}
+        -DCMAKE_CXX_FLAGS=${EXTERNAL_CMAKE_CXX_FLAGS}
+        -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}
+        -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}
+        -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+    )
+endif()
+
+# if we are in a radium process, use radium specific option, else use cmake option.
+set(EXTERNAL_INSTALL_MESSAGE ${CMAKE_INSTALL_MESSAGE})
 
 # First message formating function, need other to have better consistency
 macro(status_message MODULE NAME VAR)

diff --git a/cmake/FindFilesystem.cmake b/cmake/FindFilesystem.cmake
@@ -101,7 +101,7 @@ if(TARGET std::filesystem)
     return()
 endif()
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 include(CMakePushCheckState)
 include(CheckIncludeFileCXX)

diff --git a/cmake/QtFunctions.cmake b/cmake/QtFunctions.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 # Find Qt5 or Qt6 packages Parameters: COMPONENTS <component_list>: optional parameter listing the
 # Qt packages (e.g. Core, Widgets REQUIRED: optional parameter propagated to find_package

diff --git a/cmake/RadiumSetupFunctions.cmake b/cmake/RadiumSetupFunctions.cmake
@@ -6,7 +6,7 @@
 # Minimum version: 3.16: install target from different directory see
 # https://github.com/STORM-IRIT/Radium-Engine/pull/550#issuecomment-637415860
 
-cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 
 if(MSVC OR MSVC_IDE OR MINGW)
     include(${CMAKE_CURRENT_LIST_DIR}/Windeployqt.cmake)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -4,7 +4,7 @@
 #   * dot = for automatically generated UML diagrams (class, include, caller, call, collaboration)
 #   * PlantUML = for easy generation of custom diagrams
 
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 project(radium-doc)
 
 if(POLICY CMP0077)

diff --git a/doc/basics/compilation.md b/doc/basics/compilation.md
@@ -6,15 +6,15 @@
 The following platforms and tool chains have been tested and should work :
 
 * *Windows* : IDEs: Visual Studio 2019, 2022 (2017 is not supported due to embedded cmake version), QtCreator. Command Line: cmake+ninja+MSVC(2017, 2019, 2022) .
-* *Mac OSX* : gcc 10 or higher, Apple clang
+* *Mac OSX* : gcc 10 or higher, Apple clang, llvm clang 11 or higher
 * *Linux* : gcc 8  or higher, clang
 
 See also our Continuous Integration system at <https://github.com/STORM-IRIT/Radium-Engine/actions>.
 
 Minimal requirements
 
 * OpenGL 4.1+ / GLSL 410+
-* CMake 3.16+
+* CMake 3.18+
 * Qt5 (minimal version 5.15) or Qt6 (experimental)
 
 # Build instructions
@@ -205,7 +205,7 @@ For instance, with directory structure for externals as defined in \ref dependen
     {
         "QtDir": "C:/Qt/6.3.0/msvc2019_64/"
         "glfwDir" : "C:/path/to/glfwInstallation",
-        "ExternalInstallDir": "${projectDir}/../radium-externals/install"
+        "ExternalInstallDir": "${projectDir}/../radium-externals/install;${projectDir}/../radium-externals/install/${name}/cpplocate;"
     }
     ],
     "configurations": [
@@ -222,7 +222,7 @@ For instance, with directory structure for externals as defined in \ref dependen
         "environments": [
         {
             "environment": "RadiumDllsLocations",
-            "ExternalDllsDIR": "${env.ExternalInstallDir}/${name}/bin;${env.ExternalInstallDir}/${name}/glbinding;${env.ExternalInstallDir}/${name}/globjects",
+            "ExternalDllsDIR": "${env.ExternalInstallDir}/${name}/bin;${env.ExternalInstallDir}/${name}/cpplocate;${env.ExternalInstallDir}/${name}/glbinding;${env.ExternalInstallDir}/${name}/globjects",
             "QtDllsDIR": "${env.QtDir}/bin",
             "RadiumDlls": "${buildRoot}/src/Core;${buildRoot}/src/Engine;${buildRoot}/src/Gui;${buildRoot}/src/Headless;${buildRoot}/src/IO;${buildRoot}/src/PluginBase"
         }
@@ -241,7 +241,7 @@ For instance, with directory structure for externals as defined in \ref dependen
         "environments": [
         {
             "environment": "RadiumDllsLocations",
-            "ExternalDllsDIR": "${env.ExternalInstallDir}/${name}/bin;${env.ExternalInstallDir}/${name}/glbinding;${env.ExternalInstallDir}/${name}/globjects",
+            "ExternalDllsDIR": "${env.ExternalInstallDir}/${name}/bin;${env.ExternalInstallDir}/${name}/cpplocate;${env.ExternalInstallDir}/${name}/glbinding;${env.ExternalInstallDir}/${name}/globjects",
             "QtDllsDIR": "${env.QtDir}/bin",
             "RadiumDlls": "${buildRoot}/src/Core;${buildRoot}/src/Engine;${buildRoot}/src/Gui;${buildRoot}/src/Headless;${buildRoot}/src/IO;${buildRoot}/src/PluginBase"
         }

diff --git a/doc/developer/cmakeutilities.md b/doc/developer/cmakeutilities.md
@@ -580,8 +580,8 @@ Note that these are only guidelines and that you can always write your cmake scr
 # -------------------------------------------------------
 # Recommended preamble for cmake configuration
 # -------------------------------------------------------
-# Radium package requires cmake minimum version 3.13
-cmake_minimum_required(3.13)
+# Radium package requires cmake minimum version 3.18
+cmake_minimum_required(3.18)
 # It is recommended to disable in-source build
 set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)

diff --git a/doc/developer/plugin.md b/doc/developer/plugin.md
@@ -17,7 +17,7 @@ To compile and use a plugin, the Radium libraries must be configured, compiled a
 Example CMakeLists.txt setup to compile a Radium plugin:
 
 ```cmake
- cmake_minimum_required(VERSION 3.6)
+ cmake_minimum_required(VERSION 3.18)
  #------------------------------------------------------------------------------
  # Policies and global parameters for CMake
  if (POLICY CMP0077)

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 # -------------------------------------------------------------------------------
 # exampleApp executables setup

diff --git a/examples/CoreExample/CMakeLists.txt b/examples/CoreExample/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(CoreExample VERSION 1.0.0)

diff --git a/examples/CustomCameraManipulator/CMakeLists.txt b/examples/CustomCameraManipulator/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/DrawPrimitives/CMakeLists.txt b/examples/DrawPrimitives/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/EntityAnimation/CMakeLists.txt b/examples/EntityAnimation/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(EntityAnimation VERSION 1.0.0)

diff --git a/examples/EnvMap/CMakeLists.txt b/examples/EnvMap/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 if(APPLE)
     cmake_policy(SET CMP0042 NEW)
 endif(APPLE)

diff --git a/examples/HeadlessExample/CMakeLists.txt b/examples/HeadlessExample/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(HeadlessExample VERSION 1.0.2)

diff --git a/examples/HelloRadium/CMakeLists.txt b/examples/HelloRadium/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(HelloRadium VERSION 1.0.0)

diff --git a/examples/KeyEvent/CMakeLists.txt b/examples/KeyEvent/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/MaterialEdition/CMakeLists.txt b/examples/MaterialEdition/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(MaterialEdition VERSION 0.0.1)

diff --git a/examples/ParameterEdition/CMakeLists.txt b/examples/ParameterEdition/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(ParameterEdition VERSION 1.0.0)

diff --git a/examples/Picking/CMakeLists.txt b/examples/Picking/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/PluginsWithLib/CMakeLists.txt b/examples/PluginsWithLib/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 # ------------------------------------------------------------------------------
 # Policies and global parameters for CMake
 if(POLICY CMP0077)

diff --git a/examples/PluginsWithLib/Downstream/CMakeLists.txt b/examples/PluginsWithLib/Downstream/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 # ------------------------------------------------------------------------------
 # Policies and global parameters for CMake
 if(POLICY CMP0077)

diff --git a/examples/PluginsWithLib/Upstream/CMakeLists.txt b/examples/PluginsWithLib/Upstream/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 # ------------------------------------------------------------------------------
 # Standard "Radium" cmake preamble Policies and global parameters for CMake
 if(POLICY CMP0077)

diff --git a/examples/PluginsWithLib/Upstream/Library/CMakeLists.txt b/examples/PluginsWithLib/Upstream/Library/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 # ------------------------------------------------------------------------------
 # Policies and global parameters for CMake
 if(POLICY CMP0077)

diff --git a/examples/PluginsWithLib/Upstream/Plugin/CMakeLists.txt b/examples/PluginsWithLib/Upstream/Plugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 # ------------------------------------------------------------------------------
 # Policies and global parameters for CMake
 if(POLICY CMP0077)

diff --git a/examples/RawShaderMaterial/CMakeLists.txt b/examples/RawShaderMaterial/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/SimpleAnimation/CMakeLists.txt b/examples/SimpleAnimation/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/SimpleSimulation/CMakeLists.txt b/examples/SimpleSimulation/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)
 

diff --git a/examples/SimpleSkinning/CMakeLists.txt b/examples/SimpleSkinning/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(SimpleSkinning VERSION 1.0.0)

diff --git a/examples/TexturedQuad/CMakeLists.txt b/examples/TexturedQuad/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(TexturedQuad VERSION 1.0.0)

diff --git a/examples/TexturedQuadDynamic/CMakeLists.txt b/examples/TexturedQuadDynamic/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 cmake_policy(SET CMP0042 NEW)
 
 project(TexturedQuadDynamic VERSION 1.0.0)

diff --git a/examples/Volume/CMakeLists.txt b/examples/Volume/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 cmake_policy(SET CMP0071 NEW)
 cmake_policy(SET CMP0042 NEW)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 set(RADIUM_DEPENDENCIES_PROJECT_NAME radium_externals)
 project(${RADIUM_DEPENDENCIES_PROJECT_NAME})
 

diff --git a/external/Core/CMakeLists.txt b/external/Core/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.18)
 
 project(radiumcore-external VERSION 1.0.0)
 
@@ -70,15 +70,15 @@ if(NOT DEFINED cpplocate_DIR OR NOT cpplocate_DIR)
         GIT_TAG tags/v2.2.0
         GIT_SHALLOW TRUE
         GIT_PROGRESS TRUE
-        PATCH_COMMAND git reset --hard && git apply -v --ignore-whitespace
-                      "${CMAKE_CURRENT_LIST_DIR}/patches/cpplocate.patch"
-        INSTALL_DIR "${CMAKE_INSTALL_PREFIX}"
+        INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cpplocate"
         CMAKE_ARGS ${RADIUM_EXTERNAL_CMAKE_OPTIONS} -DOPTION_BUILD_TESTS=OFF
-                   -DOPTION_BUILD_DOCS=OFF -DCMAKE_MESSAGE_INDENT=${indent_string}\;
+                   -DOPTION_BUILD_DOCS=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+                   "-DCMAKE_MESSAGE_INDENT=${indent_string}\;"
     )
     add_dependencies(CoreExternals cpplocate)
-    set_external_dir(cpplocate "share/cpplocate/")
+    set_external_dir(cpplocate "cpplocate/")
 else()
+    add_custom_target(cpplocate)
     status_message("" "cpplocate" ${cpplocate_DIR})
 endif()
 

diff --git a/external/Core/patches/cpplocate.patch b/external/Core/patches/cpplocate.patch
diff --git a/external/Engine/CMakeLists.txt b/external/Engine/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.18)
 
 project(radiumengine-external VERSION 1.0.0)
 

diff --git a/external/Gui/CMakeLists.txt b/external/Gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.18)
 
 project(radiumgui-external VERSION 1.0.0)