From e77722b05d0a72e6d4ec0c780b86124dd7d48a57 Mon Sep 17 00:00:00 2001
From: Mathias Paulin <mathias.paulin@irit.fr>
Date: Wed, 28 Apr 2021 00:27:40 +0200
Subject: [PATCH] Prepare to new resources installation procedure
---
src/CMakeLists.txt | 7 ++++++-
src/libH3D/CMakeLists.txt | 1 -
src/libRender/CMakeLists.txt | 7 +++----
src/libRender/RadiumNBR/NodeBasedRenderer.cpp | 2 --
src/libRender/RadiumNBR/Renderer/Visualization.cpp | 2 --
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f5ecff9..fabccf8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,11 +1,16 @@
add_subdirectory(libRender)
+
if (WITH_H3D_SUPPORT)
add_subdirectory(libH3D)
endif (WITH_H3D_SUPPORT)
+
add_subdirectory(Plugin)
+
set(MARA_IN_BUILD_TREE True)
#add_subdirectory(Mara EXCLUDE_FROM_ALL)
+add_subdirectory(Mara)
+
set(VIEWER_IN_BUILD_TREE True)
add_subdirectory(DemoApp EXCLUDE_FROM_ALL)
-add_subdirectory(Mara)
+
diff --git a/src/libH3D/CMakeLists.txt b/src/libH3D/CMakeLists.txt
index 4fa15dd..776980e 100644
--- a/src/libH3D/CMakeLists.txt
+++ b/src/libH3D/CMakeLists.txt
@@ -88,6 +88,5 @@ configure_radium_library(
# TARGET ${PROJECT_NAME}
# PREFIX ${PROJECT_NAME}
# DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Resources/Shaders
-# BUILD_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/Resources/${PROJECT_NAME}
#)
diff --git a/src/libRender/CMakeLists.txt b/src/libRender/CMakeLists.txt
index 4bb346a..4c2adc9 100644
--- a/src/libRender/CMakeLists.txt
+++ b/src/libRender/CMakeLists.txt
@@ -113,11 +113,10 @@ configure_radium_library(
PACKAGE_DIR ${CMAKE_INSTALL_PREFIX}/lib/cmake
)
-installTargetResources(
+install_target_resources(
TARGET ${libName}
- PREFIX ${PROJECT_NAME}
- DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/RadiumNBR/Shaders
- BUILD_LOCATION ${CMAKE_CURRENT_BINARY_DIR}//Resources/${PROJECT_NAME}
+ RESOURCES_INSTALL_DIR ${PROJECT_NAME}
+ RESOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR}/RadiumNBR/Shaders
)
#-----------------------------------------------------------------------------------
diff --git a/src/libRender/RadiumNBR/NodeBasedRenderer.cpp b/src/libRender/RadiumNBR/NodeBasedRenderer.cpp
index e09328c..7d528e5 100644
--- a/src/libRender/RadiumNBR/NodeBasedRenderer.cpp
+++ b/src/libRender/RadiumNBR/NodeBasedRenderer.cpp
@@ -121,8 +121,6 @@ void NodeBasedRenderer::initializeInternal() {
LOG( Ra::Core::Utils::logERROR ) << "Unable to find resources for NodeBasedRenderer!";
return;
}
- else
- { LOG( Ra::Core::Utils::logINFO ) << "NodeBasedRenderer Resources are at " << *resourcesCheck; }
auto resourcesPath{*resourcesCheck};
// TODO, do we really need to setup an index for the two following passes
diff --git a/src/libRender/RadiumNBR/Renderer/Visualization.cpp b/src/libRender/RadiumNBR/Renderer/Visualization.cpp
index 333d32d..561df95 100644
--- a/src/libRender/RadiumNBR/Renderer/Visualization.cpp
+++ b/src/libRender/RadiumNBR/Renderer/Visualization.cpp
@@ -22,8 +22,6 @@ void VisualizationController::configure( RadiumNBR::NodeBasedRenderer* renderer,
LOG( Ra::Core::Utils::logERROR ) << "Unable to find resources for NodeBasedRenderer!";
return;
}
- else
- { LOG( Ra::Core::Utils::logINFO ) << "NodeBasedRenderer Resources are at " << *resourcesCheck; }
auto resourcesPath{*resourcesCheck};
auto shaderManager = Ra::Engine::RadiumEngine::getInstance()->getShaderProgramManager();
auto colortexture = renderer->sharedTextures().find( "Linear RGB (RadiumNBR)" );
--
GitLab