Mercurial > hg > orthanc-postgresql

changeset 184:4939d00da285

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better path handling
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 14 Jun 2018 13:53:05 +0200 (2018-06-14)
parents 7c7c1b5f8b3d
children e6475ac42d41
files Resources/CMake/PostgreSQLConfiguration.cmake
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/PostgreSQLConfiguration.cmake	Mon May 21 09:01:50 2018 +0200
+++ b/Resources/CMake/PostgreSQLConfiguration.cmake	Thu Jun 14 13:53:05 2018 +0200
@@ -128,14 +128,14 @@
     
   else()
     configure_file(
-      ${CMAKE_SOURCE_DIR}/Resources/Platforms/pg_config_ext.h
+      ${CMAKE_CURRENT_LIST_DIR}/../Platforms/pg_config_ext.h
       ${AUTOGENERATED_DIR}/pg_config_ext.h
       COPYONLY
       )
 
     set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h;netdb.h;sys/types.h")
 
-    include(${CMAKE_SOURCE_DIR}/Resources/Platforms/func_accept_args.cmake)
+    include(${CMAKE_CURRENT_LIST_DIR}/../Platforms/func_accept_args.cmake)
     set(ACCEPT_TYPE_ARG3 ${ACCEPT_TYPE_ARG3})
 
     check_type_size("long int" SIZE_LONG_INT)
@@ -148,7 +148,7 @@
       set(HAVE_LONG_LONG_INT_64 1)
     endif()
 
-    file(READ ${CMAKE_SOURCE_DIR}/Resources/Platforms/c_flexmember.c SOURCE)
+    file(READ ${CMAKE_CURRENT_LIST_DIR}/../Platforms/c_flexmember.c SOURCE)
     check_c_source_compiles("${SOURCE}" c_flexmember)
     if (c_flexmember)
       set(FLEXIBLE_ARRAY_MEMBER "/**/")
@@ -159,7 +159,7 @@
         CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
       set(PG_PRINTF_ATTRIBUTE "printf")
     else()
-      file(READ ${CMAKE_SOURCE_DIR}/Resources/Platforms/printf_archetype.c SOURCE)
+      file(READ ${CMAKE_CURRENT_LIST_DIR}/../Platforms/printf_archetype.c SOURCE)
       check_c_source_compiles("${SOURCE}" printf_archetype)
       if (printf_archetype)
         set(PG_PRINTF_ATTRIBUTE "gnu_printf")
@@ -232,7 +232,7 @@
     execute_process(
       COMMAND 
       ${PYTHON_EXECUTABLE}
-      "${CMAKE_SOURCE_DIR}/Resources/Platforms/PrepareCMakeConfigurationFile.py"
+      "${CMAKE_CURRENT_LIST_DIR}/../Platforms/PrepareCMakeConfigurationFile.py"
       "${LIBPQ_SOURCES_DIR}/src/include/pg_config.h.in"
       "${AUTOGENERATED_DIR}/pg_config.h.in"
       ERROR_VARIABLE NO_PG_CONFIG
@@ -355,7 +355,7 @@
   source_group(ThirdParty\\PostgreSQL REGULAR_EXPRESSION ${LIBPQ_SOURCES_DIR}/.*)
 
 else()
-  include(${CMAKE_SOURCE_DIR}/Resources/CMake/FindPostgreSQL.cmake)
+  include(${CMAKE_CURRENT_LIST_DIR}/FindPostgreSQL.cmake)
   include_directories(
     ${PostgreSQL_INCLUDE_DIR}
     ${PostgreSQL_TYPE_INCLUDE_DIR}