diff options
author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-08-17 09:17:23 +0000 |
---|---|---|
committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-08-17 09:17:23 +0000 |
commit | f30f1509cad931f6b0845d9d071ccce3a32cc8fd (patch) | |
tree | 0a4a68197283eae9c7f84c1a858ab58e67129baa /science/orthanc-postgresql/files | |
parent | Update to 2.1.2. (diff) |
- Update to 1.2
PR: 202087
Submitted by: mp39590@gmail.com (maintainer)
Diffstat (limited to 'science/orthanc-postgresql/files')
-rw-r--r-- | science/orthanc-postgresql/files/patch-CMakeLists.txt | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/science/orthanc-postgresql/files/patch-CMakeLists.txt b/science/orthanc-postgresql/files/patch-CMakeLists.txt deleted file mode 100644 index 9ba3de08dafb..000000000000 --- a/science/orthanc-postgresql/files/patch-CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ ---- CMakeLists.txt.orig 2015-07-03 09:22:49 UTC -+++ CMakeLists.txt -@@ -32,6 +32,7 @@ set(USE_SYSTEM_JSONCPP ON CACHE BOOL "Us - set(USE_SYSTEM_BOOST ON CACHE BOOL "Use the system version of Boost") - set(USE_SYSTEM_GOOGLE_TEST ON CACHE BOOL "Use the system version of Google Test") - set(USE_SYSTEM_LIBPQ ON CACHE BOOL "Use the system version of the PostgreSQL client library") -+set(BUILD_UNIT_TESTS ON CACHE BOOL "Build UnitTests") - - # Distribution-specific settings - set(USE_GTEST_DEBIAN_SOURCE_PACKAGE OFF CACHE BOOL "Use the sources of Google Test shipped with libgtest-dev (Debian only)") -@@ -47,7 +48,10 @@ include(${CMAKE_SOURCE_DIR}/Resources/CM - include(${CMAKE_SOURCE_DIR}/Resources/CMake/BoostConfiguration.cmake) - include(${CMAKE_SOURCE_DIR}/Resources/CMake/PostgreSQLConfiguration.cmake) - include(${CMAKE_SOURCE_DIR}/Resources/CMake/JsonCppConfiguration.cmake) --include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) -+ -+if (BUILD_UNIT_TESTS) -+ include(${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleTestConfiguration.cmake) -+endif() - - - # Check that the Orthanc SDK headers are available or download them -@@ -123,14 +127,21 @@ set_target_properties(OrthancPostgreSQLI - SOVERSION ${ORTHANC_POSTGRESQL_VERSION} - ) - -+install( -+ TARGETS OrthancPostgreSQLStorage OrthancPostgreSQLIndex -+ RUNTIME DESTINATION lib # Destination for Windows -+ LIBRARY DESTINATION share/orthanc/plugins # Destination for Linux -+) - --add_executable(UnitTests -- ${CORE_SOURCES} -- ${GTEST_SOURCES} -- ${AUTOGENERATED_SOURCES} -- ${CMAKE_SOURCE_DIR}/IndexPlugin/PostgreSQLWrapper.cpp -- ${CMAKE_SOURCE_DIR}/StoragePlugin/PostgreSQLStorageArea.cpp -- ${CMAKE_SOURCE_DIR}/UnitTestsSources/UnitTestsMain.cpp -- ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp -- ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp -- ) -+if (BUILD_UNIT_TESTS) -+ add_executable(UnitTests -+ ${CORE_SOURCES} -+ ${GTEST_SOURCES} -+ ${AUTOGENERATED_SOURCES} -+ ${CMAKE_SOURCE_DIR}/IndexPlugin/PostgreSQLWrapper.cpp -+ ${CMAKE_SOURCE_DIR}/StoragePlugin/PostgreSQLStorageArea.cpp -+ ${CMAKE_SOURCE_DIR}/UnitTestsSources/UnitTestsMain.cpp -+ ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLTests.cpp -+ ${CMAKE_SOURCE_DIR}/UnitTestsSources/PostgreSQLWrapperTests.cpp -+ ) -+endif() |