# HG changeset patch # User Sebastien Jodogne # Date 1531765063 -7200 # Node ID 23761c478d8642aa4ec77370960804256340ea9a # Parent 199af032e6e75000739258be3633b2a69a74701c# Parent 21e80ef7483cd4ade8e4f6d467d55a1e3e5f1755 integration 2.2->mainline diff -r 199af032e6e7 -r 23761c478d86 PostgreSQL/CMakeLists.txt --- a/PostgreSQL/CMakeLists.txt Mon Jul 16 17:24:58 2018 +0200 +++ b/PostgreSQL/CMakeLists.txt Mon Jul 16 20:17:43 2018 +0200 @@ -17,11 +17,45 @@ include(${CMAKE_SOURCE_DIR}/../Resources/CMake/DatabasesPluginConfiguration.cmake) + +if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + execute_process( + COMMAND + ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py + ${ORTHANC_PLUGIN_VERSION} "PostgreSQL storage area plugin" OrthancPostgreSQLStorage.dll + "PostgreSQL as a database back-end to Orthanc (storage area)" + ERROR_VARIABLE Failure + OUTPUT_FILE ${AUTOGENERATED_DIR}/StorageVersion.rc + ) + + if (Failure) + message(FATAL_ERROR "Error while computing the version information: ${Failure}") + endif() + + execute_process( + COMMAND + ${PYTHON_EXECUTABLE} ${ORTHANC_ROOT}/Resources/WindowsResources.py + ${ORTHANC_PLUGIN_VERSION} "PostgreSQL index plugin" OrthancPostgreSQLIndex.dll + "PostgreSQL as a database back-end to Orthanc (index)" + ERROR_VARIABLE Failure + OUTPUT_FILE ${AUTOGENERATED_DIR}/IndexVersion.rc + ) + + if (Failure) + message(FATAL_ERROR "Error while computing the version information: ${Failure}") + endif() + + set(INDEX_RESOURCES ${AUTOGENERATED_DIR}/IndexVersion.rc) + set(STORAGE_RESOURCES ${AUTOGENERATED_DIR}/StorageVersion.rc) +endif() + + EmbedResources( POSTGRESQL_PREPARE_INDEX ${CMAKE_SOURCE_DIR}/Plugins/PrepareIndex.sql ) add_library(OrthancPostgreSQLIndex SHARED + ${INDEX_RESOURCES} ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/PluginInitialization.cpp Plugins/IndexPlugin.cpp Plugins/PostgreSQLIndex.cpp @@ -32,6 +66,7 @@ add_library(OrthancPostgreSQLStorage SHARED ${ORTHANC_DATABASES_ROOT}/Framework/Plugins/PluginInitialization.cpp + ${STORAGE_RESOURCES} Plugins/PostgreSQLStorageArea.cpp Plugins/StoragePlugin.cpp