# HG changeset patch # User Sebastien Jodogne # Date 1628621536 -7200 # Node ID 8f17f23c9af7a051975da5f743a0b985ba593636 # Parent b5fb8b77ce4d9c7ef1492a27315271fff5052d13 fix diff -r b5fb8b77ce4d -r 8f17f23c9af7 Odbc/CMakeLists.txt --- a/Odbc/CMakeLists.txt Tue Aug 10 20:08:53 2021 +0200 +++ b/Odbc/CMakeLists.txt Tue Aug 10 20:52:16 2021 +0200 @@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 2.8) -project(OrthancODBC) +project(OrthancOdbc) set(ORTHANC_PLUGIN_VERSION "mainline") @@ -45,7 +45,7 @@ execute_process( COMMAND ${PYTHON_EXECUTABLE} ${ORTHANC_FRAMEWORK_ROOT}/../Resources/WindowsResources.py - ${ORTHANC_PLUGIN_VERSION} "ODBC storage area plugin" OrthancODBCStorage.dll + ${ORTHANC_PLUGIN_VERSION} "ODBC storage area plugin" OrthancOdbcStorage.dll "ODBC as a database back-end to Orthanc (storage area)" ERROR_VARIABLE Failure OUTPUT_FILE ${AUTOGENERATED_DIR}/StorageVersion.rc @@ -58,7 +58,7 @@ execute_process( COMMAND ${PYTHON_EXECUTABLE} ${ORTHANC_FRAMEWORK_ROOT}/../Resources/WindowsResources.py - ${ORTHANC_PLUGIN_VERSION} "ODBC index plugin" OrthancODBCIndex.dll + ${ORTHANC_PLUGIN_VERSION} "ODBC index plugin" OrthancOdbcIndex.dll "ODBC as a database back-end to Orthanc (index)" ERROR_VARIABLE Failure OUTPUT_FILE ${AUTOGENERATED_DIR}/IndexVersion.rc @@ -99,20 +99,20 @@ COMPILE_FLAGS -DORTHANC_ENABLE_LOGGING_PLUGIN=1 ) -add_library(OrthancODBCIndex SHARED +add_library(OrthancOdbcIndex SHARED ${INDEX_RESOURCES} Plugins/IndexPlugin.cpp ) -add_library(OrthancODBCStorage SHARED +add_library(OrthancOdbcStorage SHARED ${STORAGE_RESOURCES} Plugins/StoragePlugin.cpp ) add_dependencies(FrameworkForPlugins AutogeneratedTarget) -target_link_libraries(OrthancODBCIndex FrameworkForPlugins) -target_link_libraries(OrthancODBCStorage FrameworkForPlugins) +target_link_libraries(OrthancOdbcIndex FrameworkForPlugins) +target_link_libraries(OrthancOdbcStorage FrameworkForPlugins) message("Setting the version of the libraries to ${ORTHANC_PLUGIN_VERSION}") @@ -120,20 +120,20 @@ -DORTHANC_PLUGIN_VERSION="${ORTHANC_PLUGIN_VERSION}" ) -set_target_properties(OrthancODBCStorage PROPERTIES +set_target_properties(OrthancOdbcStorage PROPERTIES VERSION ${ORTHANC_PLUGIN_VERSION} SOVERSION ${ORTHANC_PLUGIN_VERSION} COMPILE_FLAGS -DORTHANC_ENABLE_LOGGING_PLUGIN=1 ) -set_target_properties(OrthancODBCIndex PROPERTIES +set_target_properties(OrthancOdbcIndex PROPERTIES VERSION ${ORTHANC_PLUGIN_VERSION} SOVERSION ${ORTHANC_PLUGIN_VERSION} COMPILE_FLAGS -DORTHANC_ENABLE_LOGGING_PLUGIN=1 ) install( - TARGETS OrthancODBCIndex OrthancODBCStorage + TARGETS OrthancOdbcIndex OrthancOdbcStorage RUNTIME DESTINATION lib # Destination for Windows LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux )