From f4c752f0223b4b071f4af5330f380356c5e3aa1f Mon Sep 17 00:00:00 2001 From: Mathias Paulin Date: Thu, 15 Jun 2023 11:48:15 +0200 Subject: [PATCH 1/6] [cmake] request version 3.18 --- CMakeLists.txt | 2 +- cmake/FindFilesystem.cmake | 2 +- cmake/QtFunctions.cmake | 2 +- cmake/RadiumSetupFunctions.cmake | 2 +- doc/CMakeLists.txt | 2 +- doc/basics/compilation.md | 4 ++-- doc/developer/cmakeutilities.md | 4 ++-- doc/developer/plugin.md | 2 +- examples/CMakeLists.txt | 2 +- examples/CoreExample/CMakeLists.txt | 2 +- examples/CustomCameraManipulator/CMakeLists.txt | 2 +- examples/DrawPrimitives/CMakeLists.txt | 2 +- examples/EntityAnimation/CMakeLists.txt | 2 +- examples/EnvMap/CMakeLists.txt | 2 +- examples/HeadlessExample/CMakeLists.txt | 2 +- examples/HelloRadium/CMakeLists.txt | 2 +- examples/KeyEvent/CMakeLists.txt | 2 +- examples/MaterialEdition/CMakeLists.txt | 2 +- examples/ParameterEdition/CMakeLists.txt | 2 +- examples/Picking/CMakeLists.txt | 2 +- examples/PluginsWithLib/CMakeLists.txt | 2 +- examples/PluginsWithLib/Downstream/CMakeLists.txt | 2 +- examples/PluginsWithLib/Upstream/CMakeLists.txt | 2 +- examples/PluginsWithLib/Upstream/Library/CMakeLists.txt | 2 +- examples/PluginsWithLib/Upstream/Plugin/CMakeLists.txt | 2 +- examples/RawShaderMaterial/CMakeLists.txt | 2 +- examples/SimpleAnimation/CMakeLists.txt | 2 +- examples/SimpleSimulation/CMakeLists.txt | 2 +- examples/SimpleSkinning/CMakeLists.txt | 2 +- examples/TexturedQuad/CMakeLists.txt | 2 +- examples/TexturedQuadDynamic/CMakeLists.txt | 2 +- examples/Volume/CMakeLists.txt | 2 +- external/CMakeLists.txt | 2 +- external/Core/CMakeLists.txt | 2 +- external/Engine/CMakeLists.txt | 2 +- external/Gui/CMakeLists.txt | 2 +- external/IO/CMakeLists.txt | 2 +- src/Headless/CMakeLists.txt | 2 +- 38 files changed, 40 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd42714e5ec..d80b1bddacb 100644 --- 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/FindFilesystem.cmake b/cmake/FindFilesystem.cmake index ce8aeaa2bb3..2fd8fc39dbf 100644 --- 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 index 661cf4f16c3..9ffbd210a86 100644 --- 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 : 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 index d9e75ae7f41..9c4c861422e 100644 --- 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 index 7932340578f..0a2d6911052 100644 --- 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 index 858b5cb555f..4b4dc78bf1d 100644 --- a/doc/basics/compilation.md +++ b/doc/basics/compilation.md @@ -6,7 +6,7 @@ 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 . @@ -14,7 +14,7 @@ See also our Continuous Integration system at Date: Fri, 16 Jun 2023 13:44:54 +0200 Subject: [PATCH 2/6] [cmake] fix compilation on windows --- cmake/ExternalInclude.cmake | 58 +++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/cmake/ExternalInclude.cmake b/cmake/ExternalInclude.cmake index 7df2601dd39..07d415f9a11 100644 --- a/cmake/ExternalInclude.cmake +++ b/cmake/ExternalInclude.cmake @@ -5,34 +5,50 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") else() set(EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4") endif() + set(RADIUM_EXTERNAL_CMAKE_OPTIONS + -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} + -DCMAKE_GENERATOR=${CMAKE_GENERATOR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -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_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 + ) else() set(EXTERNAL_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") + set(RADIUM_EXTERNAL_CMAKE_OPTIONS + -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} + -DCMAKE_GENERATOR=${CMAKE_GENERATOR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -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 + ) 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} - -DCMAKE_GENERATOR=${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -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 -) - # First message formating function, need other to have better consistency macro(status_message MODULE NAME VAR) message(STATUS "${MODULE} Using ${NAME} from ${VAR}") From 6128344c4d6770df0fe5049251ee1e93dee53a49 Mon Sep 17 00:00:00 2001 From: Mathias Paulin Date: Mon, 19 Jun 2023 09:30:26 +0200 Subject: [PATCH 3/6] [cmake] remove code redundancy --- cmake/ExternalInclude.cmake | 51 +++++++++++++++---------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/cmake/ExternalInclude.cmake b/cmake/ExternalInclude.cmake index 07d415f9a11..6395005964e 100644 --- a/cmake/ExternalInclude.cmake +++ b/cmake/ExternalInclude.cmake @@ -1,48 +1,37 @@ -#set the compile definition for current directory (i.e. externals) +#set the compile definition for current directory (i.e. +set(RADIUM_EXTERNAL_CMAKE_OPTIONS + -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} + -DCMAKE_GENERATOR=${CMAKE_GENERATOR} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} + -DCMAKE_INSTALL_MESSAGE=${EXTERNAL_INSTALL_MESSAGE} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + -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 - -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} - -DCMAKE_GENERATOR=${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -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_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 + 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 - -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} - -DCMAKE_GENERATOR=${CMAKE_GENERATOR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} - -DCMAKE_INSTALL_MESSAGE=${EXTERNAL_INSTALL_MESSAGE} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} + ${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} - -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 ) endif() From 378603c66bd331dd5858c331d372db35ac014ed7 Mon Sep 17 00:00:00 2001 From: Mathias Paulin Date: Mon, 19 Jun 2023 09:31:09 +0200 Subject: [PATCH 4/6] [cmake] remove custom patch on cpplocate external --- doc/basics/compilation.md | 6 ++--- external/Core/CMakeLists.txt | 10 ++++---- external/Core/patches/cpplocate.patch | 35 --------------------------- 3 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 external/Core/patches/cpplocate.patch diff --git a/doc/basics/compilation.md b/doc/basics/compilation.md index 4b4dc78bf1d..be764a85a24 100644 --- a/doc/basics/compilation.md +++ b/doc/basics/compilation.md @@ -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/external/Core/CMakeLists.txt b/external/Core/CMakeLists.txt index 28cbe761805..06fd9589787 100644 --- a/external/Core/CMakeLists.txt +++ b/external/Core/CMakeLists.txt @@ -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= + "-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 deleted file mode 100644 index 2ad15da849f..00000000000 --- a/external/Core/patches/cpplocate.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- cpplocate/CMakeLists.txt 2020-06-26 14:40:30.000000000 +0200 -+++ cpplocate/CMakeLists.txt.Radium 2020-06-26 14:44:55.000000000 +0200 -@@ -123,8 +123,6 @@ - endif() - - # Installation paths --if(UNIX AND SYSTEM_DIR_INSTALL) -- # Install into the system (/usr/bin or /usr/local/bin) - set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/ - set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share//cmake - set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/ -@@ -136,22 +134,7 @@ - set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/ - set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications - set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps -- set(INSTALL_INIT "/etc/init") # /etc/init (upstart init scripts) --else() -- # Install into local directory -- set(INSTALL_ROOT ".") # ./ -- set(INSTALL_CMAKE "cmake") # ./cmake -- set(INSTALL_EXAMPLES ".") # ./ -- set(INSTALL_DATA ".") # ./ -- set(INSTALL_BIN ".") # ./ -- set(INSTALL_SHARED "lib") # ./lib -- set(INSTALL_LIB "lib") # ./lib -- set(INSTALL_INCLUDE "include") # ./include -- set(INSTALL_DOC "doc") # ./doc -- set(INSTALL_SHORTCUTS "misc") # ./misc -- set(INSTALL_ICONS "misc") # ./misc -- set(INSTALL_INIT "misc") # ./misc --endif() -+ set(INSTALL_INIT "etc/init") # /etc/init (upstart init scripts) - - # Set runtime path - set(CMAKE_SKIP_BUILD_RPATH FALSE) # Add absolute path to all dependencies for BUILD From fb297b1005956c39f27e63fe140bd8a836b33d4d Mon Sep 17 00:00:00 2001 From: Mathias Paulin Date: Mon, 19 Jun 2023 14:13:16 +0200 Subject: [PATCH 5/6] [ci] fix cpplocate path on windows --- .github/workflows/build-matrix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml index d8061758eee..264c2553647 100644 --- 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/ From 0b8bc7c851ebc17c58eb77730d4e3cdcf5894fb7 Mon Sep 17 00:00:00 2001 From: David Vanderhaeghe Date: Wed, 21 Jun 2023 13:54:26 +0200 Subject: [PATCH 6/6] [cmake] fix typo. --- cmake/ExternalInclude.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ExternalInclude.cmake b/cmake/ExternalInclude.cmake index 6395005964e..712d83881f5 100644 --- a/cmake/ExternalInclude.cmake +++ b/cmake/ExternalInclude.cmake @@ -1,4 +1,4 @@ -#set the compile definition for current directory (i.e. +#set the compile definition for current directory (i.e. externals) set(RADIUM_EXTERNAL_CMAKE_OPTIONS -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED}