mirror of https://github.com/microsoft/vcpkg.git
46 lines
1.3 KiB
Diff
46 lines
1.3 KiB
Diff
diff --git a/meson.build b/meson.build
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -83,7 +83,7 @@ endif
|
|
###############################################################
|
|
|
|
postgres_inc_d = ['src/include']
|
|
-postgres_inc_d += get_option('extra_include_dirs')
|
|
+# postgres_inc_d += get_option('extra_include_dirs') # vcpkg: moved below
|
|
|
|
postgres_lib_d = get_option('extra_lib_dirs')
|
|
|
|
@@ -316,6 +316,7 @@ elif host_system == 'windows'
|
|
postgres_inc_d += 'src/include/port/win32'
|
|
if cc.get_id() == 'msvc'
|
|
postgres_inc_d += 'src/include/port/win32_msvc'
|
|
+ postgres_inc_d += get_option('extra_include_dirs') # vcpkg: moved here for correct priority
|
|
endif
|
|
|
|
windows = import('windows')
|
|
@@ -3218,6 +3219,7 @@ endif
|
|
generated_headers = []
|
|
# headers that the backend build depends on
|
|
generated_backend_headers = []
|
|
+generated_backend_sources = []
|
|
# configure_files() output, needs a way of converting to file names
|
|
configure_files = []
|
|
|
|
@@ -3372,12 +3374,12 @@ test_install_libs = []
|
|
|
|
subdir('src')
|
|
|
|
-subdir('contrib')
|
|
+# subdir('contrib') # vcpkg: skip
|
|
|
|
-subdir('src/test')
|
|
-subdir('src/interfaces/ecpg/test')
|
|
+# subdir('src/test') # vcpkg: skip
|
|
+# subdir('src/interfaces/ecpg/test') # vcpkg: skip
|
|
|
|
-subdir('doc/src/sgml')
|
|
+# subdir('doc/src/sgml') # vcpkg: skip
|
|
|
|
generated_sources_ac += {'': ['GNUmakefile']}
|
|
|