Changeset: edff9da23c03 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/edff9da23c03
Modified Files:
NT/mkodbcwxs.py
NT/mksqlwxs.py
clients/examples/C/CMakeLists.txt
clients/mapiclient/CMakeLists.txt
clients/mapilib/CMakeLists.txt
clients/odbc/driver/CMakeLists.txt
clients/odbc/samples/CMakeLists.txt
clients/odbc/setup/CMakeLists.txt
clients/odbc/winsetup/CMakeLists.txt
common/stream/CMakeLists.txt
ctest/tools/monetdbe/CMakeLists.txt
gdk/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
monetdb5/extras/mal_optimizer_template/CMakeLists.txt
monetdb5/extras/rapi/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/scheduler/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
sql/backends/monet5/UDF/udf/CMakeLists.txt
sql/backends/monet5/generator/CMakeLists.txt
sql/backends/monet5/vaults/fits/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/CMakeLists.txt
tools/merovingian/client/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/monetdbe/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: Jan2022
Log Message:
Once again, install .pdb files on Windows, if requested.
diffs (truncated from 699 to 300 lines):
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -82,10 +82,10 @@ def main():
id = 1
print(r' <Directory Id="lib" Name="lib">')
id = comp(features, id, 14,
- [r'bin\mapi.dll', # r'lib\mapi.pdb',
- r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb',
- r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
- r'bin\stream.dll', # r'lib\stream.pdb',
+ [r'bin\mapi.dll', r'lib\mapi.pdb',
+ r'lib\MonetODBC.dll', r'lib\MonetODBC.pdb',
+ r'lib\MonetODBCs.dll', r'lib\MonetODBCs.pdb',
+ r'bin\stream.dll', r'lib\stream.pdb',
vcpkg.format(r'bin\iconv-2.dll'),
vcpkg.format(r'bin\bz2.dll'),
vcpkg.format(r'bin\charset-1.dll'), # for iconv-2.dll
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -86,7 +86,7 @@ def main():
print(r' </Property>')
print(r' <Property Id="DEBUGEXISTS">')
print(r' <DirectorySearch Id="CheckFileDir1" Path="[INSTALLDIR]\bin"
Depth="0">')
- print(r' <FileSearch Id="CheckFile1" Name="libbat.pdb"/>')
+ print(r' <FileSearch Id="CheckFile1" Name="mserver5.pdb"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
print(r' <Property Id="INCLUDEEXISTS">')
@@ -161,14 +161,14 @@ def main():
vcpkg.format(r'bin\lzma.dll'),
vcpkg.format(r'bin\pcre.dll'),
vcpkg.format(r'bin\zlib1.dll')])
- # id = comp(debug, id, 14,
- # [r'bin\mclient.pdb',
- # r'bin\mserver5.pdb',
- # r'bin\msqldump.pdb',
- # r'lib\libbat.pdb',
- # r'lib\libmapi.pdb',
- # r'lib\libmonetdb5.pdb',
- # r'lib\libstream.pdb'])
+ id = comp(debug, id, 14,
+ [r'bin\mclient.pdb',
+ r'bin\mserver5.pdb',
+ r'bin\msqldump.pdb',
+ r'lib\bat.pdb',
+ r'lib\mapi.pdb',
+ r'lib\monetdb5.pdb',
+ r'lib\stream.pdb'])
id = comp(geom, id, 14,
[vcpkg.format(r'bin\geos_c.dll'),
vcpkg.format(r'bin\geos.dll')])
diff --git a/clients/examples/C/CMakeLists.txt
b/clients/examples/C/CMakeLists.txt
--- a/clients/examples/C/CMakeLists.txt
+++ b/clients/examples/C/CMakeLists.txt
@@ -80,6 +80,20 @@ if(TESTING)
DESTINATION
${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
+
+ if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:sample0>
+ $<TARGET_PDB_FILE:sample1>
+ $<TARGET_PDB_FILE:sample4>
+ $<TARGET_PDB_FILE:smack00>
+ $<TARGET_PDB_FILE:smack01>
+ $<TARGET_PDB_FILE:streamcat>
+ $<TARGET_PDB_FILE:bincopydata>
+ $<TARGET_PDB_FILE:bincopyloops>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ OPTIONAL)
+ endif()
endif()
# vim: set ts=2:sw=2:et
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -95,4 +95,12 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
COMPONENT client)
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:mclient>
+ $<TARGET_PDB_FILE:msqldump>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ OPTIONAL)
+endif()
+
# vim: set ts=2:sw=2:et
diff --git a/clients/mapilib/CMakeLists.txt b/clients/mapilib/CMakeLists.txt
--- a/clients/mapilib/CMakeLists.txt
+++ b/clients/mapilib/CMakeLists.txt
@@ -81,4 +81,11 @@ install(EXPORT mapiTargets
DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT clientdev)
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:mapi>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OPTIONAL)
+endif()
+
# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -145,4 +145,11 @@ install(TARGETS
COMPONENT clientdev
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:MonetODBC>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OPTIONAL)
+endif()
+
# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/samples/CMakeLists.txt
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -45,6 +45,16 @@ if(TESTING)
DESTINATION
${CMAKE_INSTALL_BINDIR}
COMPONENT clienttest)
+
+ if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:odbcsample1>
+ $<TARGET_PDB_FILE:testgetinfo>
+ $<TARGET_PDB_FILE:arraytest>
+ $<TARGET_PDB_FILE:testStmtAttr>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ OPTIONAL)
+ endif()
endif()
# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -46,4 +46,11 @@ install(TARGETS
COMPONENT clientdev
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:MonetODBCs>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OPTIONAL)
+endif()
+
# vim: set ts=2:sw=2:et
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -72,4 +72,15 @@ install(TARGETS
COMPONENT clientdev
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:odbcinstall>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ OPTIONAL)
+ install(FILES
+ $<TARGET_PDB_FILE:MonetODBCs>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OPTIONAL)
+endif()
+
# vim: set ts=2:sw=2:et
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -141,3 +141,10 @@ install(EXPORT streamTargets
NAMESPACE MonetDB::
DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT streamdev)
+
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:stream>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OPTIONAL)
+endif()
diff --git a/ctest/tools/monetdbe/CMakeLists.txt
b/ctest/tools/monetdbe/CMakeLists.txt
--- a/ctest/tools/monetdbe/CMakeLists.txt
+++ b/ctest/tools/monetdbe/CMakeLists.txt
@@ -102,4 +102,11 @@ if (TESTING)
install(TARGETS
example_proxy
DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+ if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:example_proxy>
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ OPTIONAL)
+ endif()
endif()
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -153,3 +153,10 @@ install(EXPORT gdkTargets
NAMESPACE MonetDB::
DESTINATION ${EXPORT_TARGET_PATH}
COMPONENT monetdbdev)
+
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:bat>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ OPTIONAL)
+endif()
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -71,6 +71,13 @@ if(GEOS_FOUND)
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:geomodule>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ OPTIONAL)
+ endif()
endif()
# vim: set ts=2:sw=2:et
diff --git a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
--- a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
+++ b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
@@ -19,24 +19,31 @@ target_include_directories(opt_sql_appen
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-target_link_libraries(opt_sql_append
- PRIVATE
+target_link_libraries(opt_sql_append
+ PRIVATE
monetdb_config_header
mutils
bat
monetdb5)
-target_compile_definitions(opt_sql_append
- PRIVATE
+target_compile_definitions(opt_sql_append
+ PRIVATE
LIBOPT_SQL_APPEND)
-set_target_properties(opt_sql_append
- PROPERTIES
+set_target_properties(opt_sql_append
+ PROPERTIES
NO_SONAME ON
- OUTPUT_NAME
+ OUTPUT_NAME
_opt_sql_append)
install(TARGETS
opt_sql_append
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
COMPONENT server)
+
+if(WIN32)
+ install(FILES
+ $<TARGET_PDB_FILE:opt_sql_append>
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ OPTIONAL)
+endif()
diff --git a/monetdb5/extras/rapi/CMakeLists.txt
b/monetdb5/extras/rapi/CMakeLists.txt
--- a/monetdb5/extras/rapi/CMakeLists.txt
+++ b/monetdb5/extras/rapi/CMakeLists.txt
@@ -26,33 +26,40 @@ if(LIBR_FOUND)
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
- target_link_libraries(rapi
+ target_link_libraries(rapi
PRIVATE
monetdb_config_header
- mutils
+ mutils
bat
monetdb5
sqlinclude
LibR::LibR)
- target_compile_definitions(rapi
- PRIVATE
+ target_compile_definitions(rapi
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
