From 3a252bd440566c393d5fa0449e7bc54f7edb064b Mon Sep 17 00:00:00 2001 From: Julian Thijssen Date: Wed, 11 Oct 2023 17:06:15 +0200 Subject: [PATCH] Replace library and executable references to HDPS --- ExampleAnalysis/CMakeLists.txt | 14 +++++++------- ExampleData/CMakeLists.txt | 14 +++++++------- ExampleLoader/CMakeLists.txt | 14 +++++++------- ExampleTransformation/CMakeLists.txt | 14 +++++++------- ExampleView/CMakeLists.txt | 14 +++++++------- ExampleViewJS/CMakeLists.txt | 14 +++++++------- ExampleViewOpenGL/CMakeLists.txt | 14 +++++++------- ExampleWriter/CMakeLists.txt | 14 +++++++------- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/ExampleAnalysis/CMakeLists.txt b/ExampleAnalysis/CMakeLists.txt index 2ab6d7d..61d9edf 100644 --- a/ExampleAnalysis/CMakeLists.txt +++ b/ExampleAnalysis/CMakeLists.txt @@ -84,15 +84,15 @@ target_link_libraries(${EXAMPLEANALYSIS} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLEANALYSIS} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLEANALYSIS} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLEANALYSIS} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -117,5 +117,5 @@ add_custom_command(TARGET ${EXAMPLEANALYSIS} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLEANALYSIS} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLEANALYSIS} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLEANALYSIS} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleData/CMakeLists.txt b/ExampleData/CMakeLists.txt index 357c381..245f937 100644 --- a/ExampleData/CMakeLists.txt +++ b/ExampleData/CMakeLists.txt @@ -84,15 +84,15 @@ target_link_libraries(${EXAMPLEDATA} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLEDATA} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLEDATA} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLEDATA} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -122,5 +122,5 @@ add_custom_command(TARGET ${EXAMPLEDATA} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLEDATA} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLEDATA} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLEDATA} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleLoader/CMakeLists.txt b/ExampleLoader/CMakeLists.txt index 8bc6bd5..f8e84d3 100644 --- a/ExampleLoader/CMakeLists.txt +++ b/ExampleLoader/CMakeLists.txt @@ -82,15 +82,15 @@ target_link_libraries(${EXAMPLELOADER} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLELOADER} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLELOADER} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLELOADER} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -116,5 +116,5 @@ add_custom_command(TARGET ${EXAMPLELOADER} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLELOADER} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLELOADER} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLELOADER} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleTransformation/CMakeLists.txt b/ExampleTransformation/CMakeLists.txt index 7341882..40a868a 100644 --- a/ExampleTransformation/CMakeLists.txt +++ b/ExampleTransformation/CMakeLists.txt @@ -82,15 +82,15 @@ target_link_libraries(${EXAMPLETRANSFORMATION} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLETRANSFORMATION} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLETRANSFORMATION} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLETRANSFORMATION} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -115,5 +115,5 @@ add_custom_command(TARGET ${EXAMPLETRANSFORMATION} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLETRANSFORMATION} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLETRANSFORMATION} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLETRANSFORMATION} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleView/CMakeLists.txt b/ExampleView/CMakeLists.txt index a543224..ec3818d 100644 --- a/ExampleView/CMakeLists.txt +++ b/ExampleView/CMakeLists.txt @@ -82,15 +82,15 @@ target_link_libraries(${EXAMPLEVIEW} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLEVIEW} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLEVIEW} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLEVIEW} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -115,5 +115,5 @@ add_custom_command(TARGET ${EXAMPLEVIEW} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLEVIEW} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLEVIEW} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLEVIEW} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleViewJS/CMakeLists.txt b/ExampleViewJS/CMakeLists.txt index 61ae434..7925674 100644 --- a/ExampleViewJS/CMakeLists.txt +++ b/ExampleViewJS/CMakeLists.txt @@ -101,15 +101,15 @@ target_link_libraries(${EXAMPLEVIEWJS} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLEVIEWJS} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLEVIEWJS} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLEVIEWJS} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -134,5 +134,5 @@ add_custom_command(TARGET ${EXAMPLEVIEWJS} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLEVIEWJS} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLEVIEWJS} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLEVIEWJS} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleViewOpenGL/CMakeLists.txt b/ExampleViewOpenGL/CMakeLists.txt index 58ae5e8..47b3aaa 100644 --- a/ExampleViewOpenGL/CMakeLists.txt +++ b/ExampleViewOpenGL/CMakeLists.txt @@ -96,15 +96,15 @@ target_link_libraries(${EXAMPLEVIEWGL} PRIVATE Qt6::OpenGLWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLEVIEWGL} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLEVIEWGL} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLEVIEWGL} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -129,5 +129,5 @@ add_custom_command(TARGET ${EXAMPLEVIEWGL} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLEVIEWGL} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLEVIEWGL} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLEVIEWGL} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif() diff --git a/ExampleWriter/CMakeLists.txt b/ExampleWriter/CMakeLists.txt index 2210d32..e3b635f 100644 --- a/ExampleWriter/CMakeLists.txt +++ b/ExampleWriter/CMakeLists.txt @@ -82,15 +82,15 @@ target_link_libraries(${EXAMPLEWRITER} PRIVATE Qt6::WebEngineWidgets) # Link to HDPS and data plugins # The link path in this repo assumes that the ManiVault core was built locally # in contrast to having been installed with an installer. In the latter case you'll have -# to adapt the HDPS_LINK_PATH and PLUGIN_LINK_PATH to your install folder -set(HDPS_LINK_PATH "${MV_INSTALL_DIR}/$/lib") +# to adapt the MV_LINK_PATH and PLUGIN_LINK_PATH to your install folder +set(MV_LINK_PATH "${MV_INSTALL_DIR}/$/lib") set(PLUGIN_LINK_PATH "${MV_INSTALL_DIR}/$/$,lib,Plugins>") -set(HDPS_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) +set(MV_LINK_SUFFIX $,${CMAKE_LINK_LIBRARY_SUFFIX},${CMAKE_SHARED_LIBRARY_SUFFIX}>) -set(HDPS_LINK_LIBRARY "${HDPS_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}HDPS_Public${HDPS_LINK_SUFFIX}") -set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${HDPS_LINK_SUFFIX}") +set(MV_LINK_LIBRARY "${MV_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}MV_Public${MV_LINK_SUFFIX}") +set(POINTDATA_LINK_LIBRARY "${PLUGIN_LINK_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}PointData${MV_LINK_SUFFIX}") -target_link_libraries(${EXAMPLEWRITER} PRIVATE "${HDPS_LINK_LIBRARY}") +target_link_libraries(${EXAMPLEWRITER} PRIVATE "${MV_LINK_LIBRARY}") target_link_libraries(${EXAMPLEWRITER} PRIVATE "${POINTDATA_LINK_LIBRARY}") # ----------------------------------------------------------------------------- @@ -115,5 +115,5 @@ add_custom_command(TARGET ${EXAMPLEWRITER} POST_BUILD # Automatically set the debug environment (command + working directory) for MSVC if(MSVC) set_property(TARGET ${EXAMPLEWRITER} PROPERTY VS_DEBUGGER_WORKING_DIRECTORY $,${MV_INSTALL_DIR}/debug,${MV_INSTALL_DIR}/release>) - set_property(TARGET ${EXAMPLEWRITER} PROPERTY VS_DEBUGGER_COMMAND $,${MV_INSTALL_DIR}/debug/HDPS.exe,${MV_INSTALL_DIR}/release/HDPS.exe>) + set_property(TARGET ${EXAMPLEWRITER} PROPERTY VS_DEBUGGER_COMMAND $,"${MV_INSTALL_DIR}/debug/ManiVault Studio.exe","${MV_INSTALL_DIR}/release/ManiVault Studio.exe">) endif()