Commit 9231f271 authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot
Browse files

Merge topic 'fix-ospray2-library-resolution'

477c1f15

 restore ospray dynamic library anchoring
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !758
parents 0385b2ae 477c1f15
......@@ -7,3 +7,5 @@ superbuild_add_project(openvkl
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
-DCMAKE_INSTALL_LIBDIR:STRING=lib
-DISPC_EXECUTABLE:PATH=<INSTALL_DIR>/bin/ispc)
superbuild_apply_patch(openvkl anchor-libraries "assist with dynamic library resolution")
......@@ -27,3 +27,5 @@ superbuild_add_project(ospray
superbuild_add_extra_cmake_args(
-DOSPRAY_INSTALL_DIR:PATH=<INSTALL_DIR>)
superbuild_apply_patch(ospray anchor-libraries "assist with dynamic library resolution")
diff --git a/openvkl/common/VKLCommon.cpp b/openvkl/common/VKLCommon.cpp
index a9e2f57..aa240d1 100644
--- a/openvkl/common/VKLCommon.cpp
+++ b/openvkl/common/VKLCommon.cpp
@@ -13,7 +13,7 @@ namespace openvkl {
VKLError loadLocalModule(const std::string &moduleName)
{
std::string libName = "openvkl_module_" + moduleName;
- rkcommon::loadLibrary(libName);
+ rkcommon::loadLibrary(libName, true);
std::string initSymName = "openvkl_init_module_" + moduleName;
void *initSym = rkcommon::getSymbol(initSymName);
diff --git a/doc/ospray-doc b/doc/ospray-doc
deleted file mode 160000
index e89eabcc5..000000000
--- a/doc/ospray-doc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e89eabcc590d7ec94be655305f52b5b03addbf8d
diff --git a/ospray/common/OSPCommon.cpp b/ospray/common/OSPCommon.cpp
index 7ff2b34a4..55e16aead 100644
--- a/ospray/common/OSPCommon.cpp
+++ b/ospray/common/OSPCommon.cpp
@@ -582,7 +582,7 @@ uint32_t logLevel()
OSPError loadLocalModule(const std::string &name)
{
std::string libName = "ospray_module_" + name;
- loadLibrary(libName, false);
+ loadLibrary(libName, true);
std::string initSymName = "ospray_module_init_" + name;
void *initSym = getSymbol(initSymName);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment