Renaming of HDPS to ManiVault

CMakeLists.txt

@@ -2,15 +2,19 @@
 
 cmake_minimum_required(VERSION 3.17)
 
-set(HDPS_MAIN "hdps-main")
-PROJECT(${HDPS_MAIN})
+set(MV_MAIN "mv-main")
+PROJECT(${MV_MAIN})
 
-# Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{HDPS_INSTALL_DIR} CACHE PATH "The HDPS Install Directoy")
+# Ask the user to set a ManiVault installation directory
+if(NOT DEFINED MV_INSTALL_DIR)
+    set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is, or should be installed")
+    message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is, or should be installed")
+endif()
+file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
 
 # Other user-facing options
 option(HDPS_USE_GTEST "Use GoogleTest" OFF)
-option(HDPS_USE_AVX "Use AVX if available - by default OFF" OFF)
+option(MV_USE_AVX "Use AVX if available - by default OFF" OFF)
 
 if (HDPS_USE_GTEST)
     enable_testing()

HDPS/MvCoreConfig.cmake.in

@@ -0,0 +1,7 @@
+@PACKAGE_INIT@
+
+set_and_check(MVCORE_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
+
+include("${CMAKE_CURRENT_LIST_DIR}/ManiVaultTargets.cmake")
+
+check_required_components("@PROJECT_NAME@")

HDPS/cmake/CMakeCheckSetAVX.cmake

@@ -2,7 +2,7 @@
 # Check for and link to AVX instruction sets
 # -----------------------------------------------------------------------------
 macro(check_and_set_AVX target useavx)
-	message(STATUS "Set instruction sets for ${target}, HDPS_USE_AVX is ${useavx}")
+	message(STATUS "Set instruction sets for ${target}, MV_USE_AVX is ${useavx}")
 
 	if(${useavx})
 		# Use cmake hardware checks to see whether AVX should be activated

HDPS/cmake/CMakeHdpsSourcesMain.cmake → HDPS/cmake/CMakeMvSourcesMain.cmake

@@ -1,4 +1,4 @@
-# source files for target HDPS_EXE
+# source files for target MV_EXE
 
 set( MAIN_SOURCES
     src/Main.cpp

HDPS/cmake/CMakeHdpsSourcesPrivate.cmake → HDPS/cmake/CMakeMvSourcesPrivate.cmake

@@ -1,4 +1,4 @@
-# source files for target HDPS_PRIVATE_LIB
+# source files for target MV_PRIVATE_LIB
 
 set(PRIVATE_CORE_HEADERS
     src/private/Core.h

HDPS/cmake/CMakeHdpsSourcesPublic.cmake → HDPS/cmake/CMakeMvSourcesPublic.cmake

@@ -1,4 +1,4 @@
-# source files for target HDPS_PUBLIC_LIB
+# source files for target MV_PUBLIC_LIB
 
 set(PUBLIC_CORE_INTERFACE_HEADERS
     src/CoreInterface.h

HDPS/cmake/CMakeHdpsSourcesResources.cmake → HDPS/cmake/CMakeMvSourcesResources.cmake

@@ -1,4 +1,4 @@
-# resource files for target HDPS_EXE
+# resource files for target MV_EXE
 
 set(QRESOURCES
     res/ResourcesCore.qrc

HDPS/cmake/CMakeQuaZipSymlink.cmake

@@ -15,10 +15,10 @@ string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" QUAZIP_VER_MATCH ${quazip_v
 set(quazip_ver_major ${CMAKE_MATCH_1})
 set(quazip_ver_minor ${CMAKE_MATCH_2})
 set(quazip_file_base ${CMAKE_SHARED_LIBRARY_PREFIX}${quazip_name}$<IF:$<CONFIG:DEBUG>,d,>${CMAKE_SHARED_LIBRARY_SUFFIX})
-set(quazip_lib_name ${INSTALL_DIR}/$<CONFIGURATION>/lib/${quazip_file_base}.${quazip_ver_major}.${quazip_ver_minor})
-set(quazip_symlink_name ${INSTALL_DIR}/$<CONFIGURATION>/lib/${quazip_file_base}.${quazip_ver})
+set(quazip_lib_name ${MV_INSTALL_DIR}/$<CONFIGURATION>/lib/${quazip_file_base}.${quazip_ver_major}.${quazip_ver_minor})
+set(quazip_symlink_name ${MV_INSTALL_DIR}/$<CONFIGURATION>/lib/${quazip_file_base}.${quazip_ver})
 
-add_custom_command(TARGET ${HDPS_EXE} POST_BUILD
+add_custom_command(TARGET ${MV_EXE} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E create_symlink ${quazip_lib_name} ${quazip_symlink_name}
 )
 

HDPS/src/plugins/ClusterData/CMakeLists.txt

@@ -13,10 +13,12 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
 endif(MSVC)
 
-# Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{HDPS_INSTALL_DIR} CACHE PATH "The HDPS Install Directoy")
-# Normalize the incoming install path
-file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
+# Check if the directory to the ManiVault installation has been provided
+if(NOT DEFINED MV_INSTALL_DIR)
+    set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is installed")
+    message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is installed")
+endif()
+file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
 
 find_package(Qt6 COMPONENTS Widgets WebEngineWidgets REQUIRED)
 
@@ -97,7 +99,7 @@ add_library(${CLUSTERDATA} SHARED ${CLUSTERD_SOURCES} ${ACTIONS_SOURCES} ${MODEL
 qt_wrap_cpp(CLUSTERDATA_MOC ${PLUGIN_MOC_HEADERS} TARGET ${CLUSTERDATA})
 target_sources(${CLUSTERDATA} PRIVATE ${CLUSTERDATA_MOC})
 
-target_include_directories(${CLUSTERDATA} PRIVATE "${INSTALL_DIR}/$<CONFIGURATION>/include/")
+target_include_directories(${CLUSTERDATA} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")
 
 target_compile_features(${CLUSTERDATA} PRIVATE cxx_std_17)
 
@@ -112,11 +114,11 @@ list(APPEND CLUSTER_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_HEADER_FILE_NAM
 
 target_link_libraries(${CLUSTERDATA} PRIVATE Qt6::Widgets)
 target_link_libraries(${CLUSTERDATA} PRIVATE Qt6::WebEngineWidgets)
-target_link_libraries(${CLUSTERDATA} PRIVATE HDPS_Public)
+target_link_libraries(${CLUSTERDATA} PRIVATE ${MV_PUBLIC_LIB})
 target_link_libraries(${CLUSTERDATA} PRIVATE PointData)
 
 # Use avx if enabled and available
-check_and_set_AVX(${CLUSTERDATA} ${HDPS_USE_AVX})
+check_and_set_AVX(${CLUSTERDATA} ${MV_USE_AVX})
 
 set_target_properties(${CLUSTERDATA} PROPERTIES PUBLIC_HEADER "${CLUSTER_HEADERS}")
 
@@ -131,5 +133,5 @@ add_custom_command(TARGET ${CLUSTERDATA} POST_BUILD
     COMMAND ${CMAKE_COMMAND}
         --install ${CMAKE_CURRENT_BINARY_DIR}
         --config $<CONFIGURATION>
-        --prefix ${INSTALL_DIR}/$<CONFIGURATION>
+        --prefix ${MV_INSTALL_DIR}/$<CONFIGURATION>
 )

HDPS/src/plugins/ColorData/CMakeLists.txt

@@ -8,15 +8,17 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
 endif(MSVC)
 
-# Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{HDPS_INSTALL_DIR} CACHE PATH "The HDPS Install Directoy")
-# Normalize the incoming install path
-file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
+# Check if the directory to the ManiVault installation has been provided
+if(NOT DEFINED MV_INSTALL_DIR)
+    set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is installed")
+    message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is installed")
+endif()
+file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
 
 find_package(Qt6 COMPONENTS Widgets WebEngineWidgets REQUIRED)
 
@@ -41,13 +43,13 @@ add_library(${COLORDATA} SHARED ${COLORDATA_SOURCES})
 qt_wrap_cpp(COLORDATA_MOC ${PLUGIN_MOC_HEADERS} TARGET ${COLORDATA})
 target_sources(${COLORDATA} PRIVATE ${COLORDATA_MOC})
 
-target_include_directories(${COLORDATA} PRIVATE "${INSTALL_DIR}/$<CONFIGURATION>/include/")
+target_include_directories(${COLORDATA} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")
 
 target_compile_features(${COLORDATA} PRIVATE cxx_std_17)
 
 target_link_libraries(${COLORDATA} PRIVATE Qt6::Widgets)
 target_link_libraries(${COLORDATA} PRIVATE Qt6::WebEngineWidgets)
-target_link_libraries(${COLORDATA} PRIVATE HDPS_Public)
+target_link_libraries(${COLORDATA} PRIVATE ${MV_PUBLIC_LIB})
 
 set_target_properties(${COLORDATA} PROPERTIES PUBLIC_HEADER "${COLORDATA_HEADERS}")
 
@@ -62,5 +64,5 @@ add_custom_command(TARGET ${COLORDATA} POST_BUILD
     COMMAND ${CMAKE_COMMAND}
         --install ${CMAKE_CURRENT_BINARY_DIR}
         --config $<CONFIGURATION>
-        --prefix ${INSTALL_DIR}/$<CONFIGURATION>
+        --prefix ${MV_INSTALL_DIR}/$<CONFIGURATION>
 )

HDPS/src/plugins/DataHierarchyPlugin/CMakeLists.txt

@@ -13,10 +13,12 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
 endif(MSVC)
 
-# Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{HDPS_INSTALL_DIR} CACHE PATH "The HDPS Install Directoy")
-# Normalize the incoming install path
-file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
+# Check if the directory to the ManiVault installation has been provided
+if(NOT DEFINED MV_INSTALL_DIR)
+    set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is installed")
+    message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is installed")
+endif()
+file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
 
 find_package(Qt6 6.3.1 COMPONENTS Widgets WebEngineWidgets REQUIRED)
 
@@ -26,7 +28,7 @@ set(PLUGIN
 )
 
 set(PLUGIN_MOC_HEADERS
-	src/DataHierarchyPlugin.h
+    src/DataHierarchyPlugin.h
 )
 
 set(WIDGETS
@@ -41,9 +43,9 @@ set(AUX
 )
 
 set(DATAHIERARCHY_SOURCES
-	${PLUGIN}
-	${WIDGETS}
-	${AUX}
+    ${PLUGIN}
+    ${WIDGETS}
+    ${AUX}
 )
 
 source_group(Plugin FILES ${PLUGIN})
@@ -55,31 +57,31 @@ add_library(${DATAHIERARCHYPLUGIN} SHARED ${DATAHIERARCHY_SOURCES})
 qt_wrap_cpp(DATAHIERARCHY_MOC ${PLUGIN_MOC_HEADERS} TARGET ${DATAHIERARCHYPLUGIN})
 target_sources(${DATAHIERARCHYPLUGIN} PRIVATE ${DATAHIERARCHY_MOC})
 
-target_include_directories(${DATAHIERARCHYPLUGIN} PRIVATE "${INSTALL_DIR}/$<CONFIGURATION>/include/")
+target_include_directories(${DATAHIERARCHYPLUGIN} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")
 
 target_compile_features(${DATAHIERARCHYPLUGIN} PRIVATE cxx_std_17)
 
 target_link_libraries(${DATAHIERARCHYPLUGIN} PRIVATE Qt6::Widgets)
 target_link_libraries(${DATAHIERARCHYPLUGIN} PRIVATE Qt6::WebEngineWidgets)
-target_link_libraries(${DATAHIERARCHYPLUGIN} PRIVATE HDPS_Public)
+target_link_libraries(${DATAHIERARCHYPLUGIN} PRIVATE ${MV_PUBLIC_LIB})
 
 # Use avx if enabled and available
-check_and_set_AVX(${DATAHIERARCHYPLUGIN} ${HDPS_USE_AVX})
+check_and_set_AVX(${DATAHIERARCHYPLUGIN} ${MV_USE_AVX})
 
 install(TARGETS ${DATAHIERARCHYPLUGIN}
     RUNTIME DESTINATION Plugins COMPONENT PLUGINS # Windows .dll
     LIBRARY DESTINATION Plugins COMPONENT PLUGINS # Linux/Mac .so
 )
 
 add_custom_command(TARGET ${DATAHIERARCHYPLUGIN} POST_BUILD
-	COMMAND ${CMAKE_COMMAND}
-	--install ${CMAKE_CURRENT_BINARY_DIR}
-	--config $<CONFIGURATION>
-	--prefix ${INSTALL_DIR}/$<CONFIGURATION>
+    COMMAND ${CMAKE_COMMAND}
+    --install ${CMAKE_CURRENT_BINARY_DIR}
+    --config $<CONFIGURATION>
+    --prefix ${MV_INSTALL_DIR}/$<CONFIGURATION>
 )
 
 # Automatically set the debug environment (command + working directory) for MSVC
 if(MSVC)
-    set_property(TARGET ${DATAHIERARCHYPLUGIN} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${INSTALL_DIR}/debug,${INSTALL_DIR}/release>)
-    set_property(TARGET ${DATAHIERARCHYPLUGIN} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,${INSTALL_DIR}/debug/HDPS.exe,${INSTALL_DIR}/release/HDPS.exe>)
+    set_property(TARGET ${DATAHIERARCHYPLUGIN} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>)
+    set_property(TARGET ${DATAHIERARCHYPLUGIN} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,${MV_INSTALL_DIR}/debug/${MV_APPLICATION_NAME}.exe,${MV_INSTALL_DIR}/release/${MV_APPLICATION_NAME}.exe>)
 endif()

HDPS/src/plugins/DataPropertiesPlugin/CMakeLists.txt

@@ -13,10 +13,12 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
 endif(MSVC)
 
-# Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{HDPS_INSTALL_DIR} CACHE PATH "The HDPS Install Directoy")
-# Normalize the incoming install path
-file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
+# Check if the directory to the ManiVault installation has been provided
+if(NOT DEFINED MV_INSTALL_DIR)
+    set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is installed")
+    message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is installed")
+endif()
+file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
 
 find_package(Qt6 6.3.1 COMPONENTS Widgets WebEngineWidgets REQUIRED)
 
@@ -39,9 +41,9 @@ set(AUX
 )
 
 set(DATAPROPERTIES_SOURCES
-	${PLUGIN}
-	${WIDGETS}
-	${AUX}
+    ${PLUGIN}
+    ${WIDGETS}
+    ${AUX}
 )
 
 source_group(Plugin FILES ${PLUGIN})
@@ -53,32 +55,32 @@ add_library(${DATAPROPERTIESPLUGIN} SHARED ${DATAPROPERTIES_SOURCES})
 qt_wrap_cpp(DATAPROPERTIES_MOC ${PLUGIN_MOC_HEADERS} TARGET ${DATAPROPERTIESPLUGIN})
 target_sources(${DATAPROPERTIESPLUGIN} PRIVATE ${DATAPROPERTIES_MOC})
 
-target_include_directories(${DATAPROPERTIESPLUGIN} PRIVATE "${INSTALL_DIR}/$<CONFIGURATION>/include/")
+target_include_directories(${DATAPROPERTIESPLUGIN} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")
 
 target_compile_features(${DATAPROPERTIESPLUGIN} PRIVATE cxx_std_17)
 
 target_link_libraries(${DATAPROPERTIESPLUGIN} PRIVATE Qt6::Core)
 target_link_libraries(${DATAPROPERTIESPLUGIN} PRIVATE Qt6::Widgets)
 target_link_libraries(${DATAPROPERTIESPLUGIN} PRIVATE Qt6::WebEngineWidgets)
-target_link_libraries(${DATAPROPERTIESPLUGIN} PRIVATE HDPS_Public)
+target_link_libraries(${DATAPROPERTIESPLUGIN} PRIVATE ${MV_PUBLIC_LIB})
 
 # Use avx if enabled and available
-check_and_set_AVX(${DATAPROPERTIESPLUGIN} ${HDPS_USE_AVX})
+check_and_set_AVX(${DATAPROPERTIESPLUGIN} ${MV_USE_AVX})
 
 install(TARGETS ${DATAPROPERTIESPLUGIN}
     RUNTIME DESTINATION Plugins COMPONENT PLUGINS # Windows .dll
     LIBRARY DESTINATION Plugins COMPONENT PLUGINS # Linux/Mac .so
 )
 
 add_custom_command(TARGET ${DATAPROPERTIESPLUGIN} POST_BUILD
-	COMMAND ${CMAKE_COMMAND}
-	--install ${CMAKE_CURRENT_BINARY_DIR}
-	--config $<CONFIGURATION>
-	--prefix ${INSTALL_DIR}/$<CONFIGURATION>
+    COMMAND ${CMAKE_COMMAND}
+    --install ${CMAKE_CURRENT_BINARY_DIR}
+    --config $<CONFIGURATION>
+    --prefix ${MV_INSTALL_DIR}/$<CONFIGURATION>
 )
 
 # Automatically set the debug environment (command + working directory) for MSVC
 if(MSVC)
-    set_property(TARGET ${DATAPROPERTIESPLUGIN} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${INSTALL_DIR}/debug,${INSTALL_DIR}/release>)
-    set_property(TARGET ${DATAPROPERTIESPLUGIN} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,${INSTALL_DIR}/debug/HDPS.exe,${INSTALL_DIR}/release/HDPS.exe>)
+    set_property(TARGET ${DATAPROPERTIESPLUGIN} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $<IF:$<CONFIG:DEBUG>,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>)
+    set_property(TARGET ${DATAPROPERTIESPLUGIN} PROPERTY VS_DEBUGGER_COMMAND $<IF:$<CONFIG:DEBUG>,${MV_INSTALL_DIR}/debug/${MV_APPLICATION_NAME}.exe,${MV_INSTALL_DIR}/release/${MV_APPLICATION_NAME}.exe>)
 endif()

HDPS/src/plugins/ImageData/CMakeLists.txt

@@ -9,15 +9,17 @@ set(CMAKE_AUTOMOC ON)
 
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3 /DWIN32 /EHsc /MP /permissive- /Zc:__cplusplus")
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
-	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
-	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MDd")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MD")
 endif(MSVC)
 
-# Get the env path and allow the user to change it
-set(INSTALL_DIR $ENV{HDPS_INSTALL_DIR} CACHE PATH "The HDPS Install Directoy")
-# Normalize the incoming install path
-file(TO_CMAKE_PATH ${INSTALL_DIR} INSTALL_DIR)
+# Check if the directory to the ManiVault installation has been provided
+if(NOT DEFINED MV_INSTALL_DIR)
+    set(MV_INSTALL_DIR "" CACHE PATH "Directory where ManiVault is installed")
+    message(FATAL_ERROR "Please set MV_INSTALL_DIR to the directory where ManiVault is installed")
+endif()
+file(TO_CMAKE_PATH ${MV_INSTALL_DIR} MV_INSTALL_DIR)
 
 find_package(Qt6 COMPONENTS Widgets WebEngineWidgets REQUIRED)
 
@@ -33,7 +35,7 @@ set(IMAGE_DATA_HEADERS
 )
 
 set(PLUGIN_MOC_HEADERS
-	src/ImageData.h
+    src/ImageData.h
 )
 
 set(IMAGE_DATA_SOURCES 
@@ -56,7 +58,7 @@ add_library(${IMAGEDATA} SHARED ${IMAGE_DATA_HEADERS} ${IMAGE_DATA_SOURCES} ${AC
 qt_wrap_cpp(IMAGEDATA_MOC ${PLUGIN_MOC_HEADERS} TARGET ${IMAGEDATA})
 target_sources(${IMAGEDATA} PRIVATE ${IMAGEDATA_MOC})
 
-target_include_directories(${IMAGEDATA} PRIVATE "${INSTALL_DIR}/$<CONFIGURATION>/include/")
+target_include_directories(${IMAGEDATA} PRIVATE "${MV_INSTALL_DIR}/$<CONFIGURATION>/include/")
 
 target_compile_features(${IMAGEDATA} PRIVATE cxx_std_17)
 
@@ -70,7 +72,7 @@ list(APPEND IMAGE_DATA_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_HEADER_FILE_
 
 target_link_libraries(${IMAGEDATA} PRIVATE Qt6::Widgets)
 target_link_libraries(${IMAGEDATA} PRIVATE Qt6::WebEngineWidgets)
-target_link_libraries(${IMAGEDATA} PRIVATE HDPS_Public)
+target_link_libraries(${IMAGEDATA} PRIVATE ${MV_PUBLIC_LIB})
 target_link_libraries(${IMAGEDATA} PRIVATE PointData)
 target_link_libraries(${IMAGEDATA} PRIVATE ClusterData)
 
@@ -87,5 +89,5 @@ add_custom_command(TARGET ${IMAGEDATA} POST_BUILD
     COMMAND ${CMAKE_COMMAND}
         --install ${CMAKE_CURRENT_BINARY_DIR}
         --config $<CONFIGURATION>
-        --prefix ${INSTALL_DIR}/$<CONFIGURATION>
+        --prefix ${MV_INSTALL_DIR}/$<CONFIGURATION>
 )