From ed678d1eb6593ef4824d5b2fdab36ecac433e0a5 Mon Sep 17 00:00:00 2001 From: Nicolas Mellado Date: Mon, 8 Feb 2021 18:57:24 +0100 Subject: [PATCH 1/2] [cmake] Fix 682 Create target-level dependency between globject and eigen when compiling externals Signed-off-by: Nicolas Mellado --- external/Engine/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/external/Engine/CMakeLists.txt b/external/Engine/CMakeLists.txt index d17afc05a9b..112717f1831 100644 --- a/external/Engine/CMakeLists.txt +++ b/external/Engine/CMakeLists.txt @@ -67,9 +67,11 @@ else() StatusMessage("" "glbinding" "${glbinding_DIR}") endif() +set(GLOBJECTS_NEEDS_EIGEN_DEP FALSE) if (NOT DEFINED Eigen3_DIR) message(STATUS "globjects use bundled eigen3") set(Eigen3_DIR ${CMAKE_INSTALL_PREFIX}/share/eigen3/cmake/) + set(GLOBJECTS_NEEDS_EIGEN_DEP TRUE) else () message(STATUS "globjects use eigen3 from ${Eigen3_DIR}") endif () @@ -96,6 +98,10 @@ if (NOT DEFINED globjects_DIR) ) set(globjects_DIR ${CMAKE_INSTALL_PREFIX}/share/globjects) + + if(GLOBJECTS_NEEDS_EIGEN_DEP) + add_dependencies( globjects Eigen3 ) + endif() else() StatusMessage("" "globjects" "${globjects_DIR}") endif() From a054399709bf372e6631f26d60e94711c9791279 Mon Sep 17 00:00:00 2001 From: dlyr Date: Mon, 8 Feb 2021 21:27:38 +0100 Subject: [PATCH 2/2] another try --- external/Core/CMakeLists.txt | 2 +- external/Engine/CMakeLists.txt | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/external/Core/CMakeLists.txt b/external/Core/CMakeLists.txt index 1593306d6cc..573509960f4 100644 --- a/external/Core/CMakeLists.txt +++ b/external/Core/CMakeLists.txt @@ -31,6 +31,7 @@ if (NOT DEFINED Eigen3_DIR) ) else () StatusMessage("" "eigen3" ${Eigen3_DIR}) + add_custom_target(Eigen3) endif () @@ -71,7 +72,6 @@ if (NOT DEFINED cpplocate_DIR OR NOT cpplocate_DIR) -DOPTION_BUILD_TESTS=OFF -DOPTION_BUILD_DOCS=OFF -DCMAKE_MESSAGE_INDENT=${indent_string}\; - ) else() StatusMessage("" "cpplocate" ${cpplocate_DIR}) diff --git a/external/Engine/CMakeLists.txt b/external/Engine/CMakeLists.txt index 112717f1831..c9d5460c029 100644 --- a/external/Engine/CMakeLists.txt +++ b/external/Engine/CMakeLists.txt @@ -67,11 +67,9 @@ else() StatusMessage("" "glbinding" "${glbinding_DIR}") endif() -set(GLOBJECTS_NEEDS_EIGEN_DEP FALSE) if (NOT DEFINED Eigen3_DIR) message(STATUS "globjects use bundled eigen3") set(Eigen3_DIR ${CMAKE_INSTALL_PREFIX}/share/eigen3/cmake/) - set(GLOBJECTS_NEEDS_EIGEN_DEP TRUE) else () message(STATUS "globjects use eigen3 from ${Eigen3_DIR}") endif () @@ -85,7 +83,7 @@ if (NOT DEFINED globjects_DIR) GIT_PROGRESS TRUE PATCH_COMMAND git reset --hard && git apply -v --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/patches/globjects.patch" INSTALL_DIR "${CMAKE_INSTALL_PREFIX}" - DEPENDS glbinding glm + DEPENDS glbinding glm Eigen3 CMAKE_ARGS ${RADIUM_EXTERNAL_CMAKE_OPTIONS} -DOPTION_BUILD_DOCS=OFF @@ -98,10 +96,6 @@ if (NOT DEFINED globjects_DIR) ) set(globjects_DIR ${CMAKE_INSTALL_PREFIX}/share/globjects) - - if(GLOBJECTS_NEEDS_EIGEN_DEP) - add_dependencies( globjects Eigen3 ) - endif() else() StatusMessage("" "globjects" "${globjects_DIR}") endif()