[dataflow] update configuration files

STORM-IRIT · Nov 1, 2022 · a83fa25 · a83fa25
1 parent b36f02e
commit a83fa25
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/src/Dataflow/Config.cmake.in b/src/Dataflow/Config.cmake.in
@@ -25,16 +25,17 @@ if (Dataflow_FOUND AND NOT TARGET Dataflow)
         endif()
     endif()
 
-    if(NOT DataflowRendering_FOUND)
-        if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../DataflowRendering/RadiumDataflowRenderingConfig.cmake")
-            set(DataflowRendering_FOUND TRUE)
-            include(${CMAKE_CURRENT_LIST_DIR}/../DataflowRendering/RadiumDataflowRenderingConfig.cmake)
-        else()
-            set(Radium_FOUND False)
-            set(Radium_NOT_FOUND_MESSAGE "Radium::Dataflow: dependency DataflowRendering not found")
-            set(Configure_Dataflow OFF)
-        endif()
-    endif()
+# to be uncommented when dataflow rendering subpackage will be available
+#    if(NOT DataflowRendering_FOUND)
+#        if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/../DataflowRendering/RadiumDataflowRenderingConfig.cmake")
+#            set(DataflowRendering_FOUND TRUE)
+#            include(${CMAKE_CURRENT_LIST_DIR}/../DataflowRendering/RadiumDataflowRenderingConfig.cmake)
+#        else()
+#            set(Radium_FOUND False)
+#            set(Radium_NOT_FOUND_MESSAGE "Radium::Dataflow: dependency DataflowRendering not found")
+#            set(Configure_Dataflow OFF)
+#        endif()
+#    endif()
 endif()
 
 # configure Dataflow component

diff --git a/src/Dataflow/Core/CMakeLists.txt b/src/Dataflow/Core/CMakeLists.txt
@@ -10,8 +10,6 @@ add_library(
                                      ${dataflow_core_inlines} ${dataflow_core_private}
 )
 
-# LocalDependencies from parent scope
-populate_local_dependencies(NAME "stduuid_DIR")
 find_package(stduuid REQUIRED NO_DEFAULT_PATH)
 
 # This one should be extracted directly from parent project properties.

diff --git a/src/Dataflow/Core/Config.cmake.in b/src/Dataflow/Core/Config.cmake.in
@@ -18,13 +18,7 @@ endif()
 
 if(Configure_DataflowCore)
     # Theses paths reflect the paths founds in RadiumEngine/external/Dataflow/package
-    set(_BaseExternalDir_ "${CMAKE_CURRENT_LIST_DIR}/../../../../")
-    if("@stduuid_DIR@" STREQUAL "")
-        set(stduuid_DIR "${_BaseExternalDir_}/@stduuid_sub_DIR@")
-    else()
-        set(stduuid_DIR "@stduuid_DIR@")
-    endif()
-
+    set(stduuid_DIR "@stduuid_DIR@")
     find_dependency(stduuid REQUIRED NO_DEFAULT_PATH)
     include("${CMAKE_CURRENT_LIST_DIR}/../Dataflow/Core/DataflowCoreTargets.cmake")
 endif()
diff --git a/src/Dataflow/QtGui/CMakeLists.txt b/src/Dataflow/QtGui/CMakeLists.txt
@@ -3,7 +3,7 @@ list(APPEND CMAKE_MESSAGE_INDENT "[${ra_dataflowqtgui_target}] ")
 
 project(${ra_dataflowqtgui_target} LANGUAGES CXX VERSION ${Radium_VERSION})
 
-find_package(RadiumNodeEditor REQUIRED)
+find_package(RadiumNodeEditor REQUIRED NO_DEFAULT_PATH)
 
 include(filelist.cmake)
 

diff --git a/src/Dataflow/QtGui/Config.cmake.in b/src/Dataflow/QtGui/Config.cmake.in
@@ -34,12 +34,10 @@ if (DataflowQtGui_FOUND AND NOT TARGET DataflowQtGui)
 endif()
 
 if(Configure_DataflowQtGui)
-    if("@RadiumNodeEditor_DIR@" STREQUAL "")
-        set(RadiumNodeEditor_DIR "${_BaseExternalDir_}/@RadiumNodeEditor_sub_DIR@")
-    else()
-        set(RadiumNodeEditor_DIR "@RadiumNodeEditor_DIR@")
+    set(RadiumNodeEditor_DIR "@RadiumNodeEditor_DIR@")
+    find_dependency(RadiumNodeEditor REQUIRED NO_DEFAULT_PATH)
+    if(MSVC OR MSVC_IDE OR MINGW)
+        add_imported_dir(FROM RadiumNodeEditor::RadiumNodeEditor TO RadiumExternalDlls_location)
     endif()
-    find_dependency(glm REQUIRED NO_DEFAULT_PATH)
-    find_dependency(RadiumNodeEditor REQUIRED)
     include("${CMAKE_CURRENT_LIST_DIR}/../Dataflow/QtGui/DataflowQtGuiTargets.cmake")
 endif()