Permalink
Browse files

Merge remote-tracking branch 'upstream/master-dev' into master-dev

  • Loading branch information...
schatzkn committed Oct 8, 2018
2 parents b8a7402 + 2bae285 commit 2cbcc9478daae6487553b17061370c0847dcbc48
@@ -2,7 +2,7 @@
print("I am the Standard MegaMol configuration!")
basePath = "${CMAKE_SOURCE_DIR}/"
basePath = "${CMAKE_INSTALL_PREFIX}/"
mmSetLogLevel(0)
mmSetEchoLevel("*")
@@ -10,12 +10,13 @@
#if (defined(_MSC_VER) && (_MSC_VER > 1000))
#pragma once
#endif /* (defined(_MSC_VER) && (_MSC_VER > 1000)) */
#include <stdlib.h>
/**
* Struct to be returned by a plugin api holding compatibility informations
*/
typedef struct _mmplg_compatibilityvalues_t {
SIZE_T size; // number of bytes of this struct
size_t size; // number of bytes of this struct
const char* mmcoreRev; // MegaMol� core revision
const char* vislibRev; // VISlib revision or zero if no vislib is used
} mmplgCompatibilityValues;
@@ -242,7 +242,9 @@ PluginManager::collection_type PluginManager::ContinueLoad200(
plugin200->SetAssemblyFileName(path);
// connect static objects
plugin200->connectStatics(Plugin200Instance::StaticConnectorType::Log, static_cast<void*>(&vislib::sys::Log::DefaultLog));
//plugin200->connectStatics(Plugin200Instance::StaticConnectorType::Log, static_cast<void*>(&vislib::sys::Log::DefaultLog));
plugin200->connectStatics(
Plugin200Instance::StaticConnectorType::Log, static_cast<void*>(&coreInst.Log()));
// initialize factories
plugin200->GetModuleDescriptionManager();
@@ -41,7 +41,7 @@ if(BUILD_OSPRAY_PLUGIN)
install(TARGETS ${PROJECT_NAME} DESTINATION "lib" EXPORT ${PROJECT_NAME}-target)
foreach(lib ${OSPRAY_LIBRARIES})
get_filename_component(dir ${lib} DIRECTORY)
install(DIRECTORY "${dir}" DESTINATION "lib" FILES_MATCHING PATTERN "lib*")
install(DIRECTORY "${dir}" DESTINATION "${CMAKE_INSTALL_PREFIX}" FILES_MATCHING PATTERN "lib*")
endforeach()
endif()

0 comments on commit 2cbcc94

Please sign in to comment.