Changeset: 8b14a84dc1dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b14a84dc1dc
Modified Files:
CMakeLists.txt
clients/examples/C/CMakeLists.txt
clients/examples/perl/CMakeLists.txt
clients/examples/php/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
monetdb5/tools/CMakeLists.txt
testing/CMakeLists.txt
tools/merovingian/client/CMakeLists.txt
tools/merovingian/daemon/CMakeLists.txt
tools/merovingian/daemon/config/CMakeLists.txt
tools/mserver/CMakeLists.txt
Branch: mbedded
Log Message:
merged
diffs (truncated from 380 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,7 +216,8 @@ write_basic_package_version_file(
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/MonetDBConfig.cmake
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake)
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
+ COMPONENT monetdbdev)
include(monetdb-packages)
@@ -226,3 +227,5 @@ add_subdirectory(ctest)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
+
+# vim: set ts=2:sw=2:et
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
@@ -45,5 +45,8 @@ if(TESTING)
smack01
RUNTIME
DESTINATION
- ${CMAKE_INSTALL_BINDIR})
+ ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
endif()
+
+# vim: set ts=2:sw=2:et
diff --git a/clients/examples/perl/CMakeLists.txt
b/clients/examples/perl/CMakeLists.txt
--- a/clients/examples/perl/CMakeLists.txt
+++ b/clients/examples/perl/CMakeLists.txt
@@ -10,10 +10,14 @@ if(TESTING)
install(FILES
sqlsample.pl
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
install(FILES
malsample.pl
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
endif()
+
+# vim: set ts=2:sw=2:et
diff --git a/clients/examples/php/CMakeLists.txt
b/clients/examples/php/CMakeLists.txt
--- a/clients/examples/php/CMakeLists.txt
+++ b/clients/examples/php/CMakeLists.txt
@@ -10,5 +10,8 @@ if(TESTING)
install(FILES
sqlsample.php
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
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
@@ -128,4 +128,7 @@ install(TARGETS
install(FILES
mclient.1
msqldump.1
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+ COMPONENT mclient)
+
+# 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
@@ -47,8 +47,7 @@ set_target_properties(mapi
PROPERTIES
VERSION ${MAPI_VERSION}
SOVERSION ${MAPI_VERSION_MAJOR}
- PUBLIC_HEADER mapi.h
- PUBLIC_HEADER mapi_querytype.h)
+ PUBLIC_HEADER mapi.h)
if (NOT WIN32)
configure_file(monetdb-mapi.pc.in
@@ -82,3 +81,5 @@ install(EXPORT mapiTargets
NAMESPACE MonetDB::
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
COMPONENT clientdev)
+
+# 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
@@ -117,21 +117,21 @@ target_compile_definitions(MonetODBC
target_link_libraries(MonetODBC
PRIVATE
monetdb_config_header
- mutils
- mapi
- ODBC::ODBC)
+ mutils
+ mapi
+ ODBC::ODBC)
install(TARGETS
MonetODBC
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT client
+ COMPONENT odbc
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
+ COMPONENT odbc
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
+ COMPONENT odbc
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT clientdev
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
@@ -43,5 +43,8 @@ if(TESTING)
testStmtAttr
RUNTIME
DESTINATION
- ${CMAKE_INSTALL_BINDIR})
+ ${CMAKE_INSTALL_BINDIR}
+ COMPONENT clienttest)
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
@@ -32,14 +32,16 @@ install(TARGETS
MonetODBCs
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT client
+ COMPONENT odbc
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
+ COMPONENT odbc
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
+ COMPONENT odbc
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT clientdev
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+# 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
@@ -17,8 +17,8 @@ target_sources(MonetODBCs
resource.h)
target_include_directories(MonetODBCs
- PRIVATE
- $<$<PLATFORM_ID:Windows>:${HAVE_AFXRES_H}>
+ PRIVATE
+ $<$<PLATFORM_ID:Windows>:${HAVE_AFXRES_H}>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
@@ -31,21 +31,21 @@ target_link_libraries(MonetODBCs
PRIVATE
monetdb_config_header
mutils
- $<$<PLATFORM_ID:Windows>:odbccp32>
- $<$<PLATFORM_ID:Windows>:user32>
- $<$<PLATFORM_ID:Windows>:legacy_stdio_definitions>)
+ $<$<PLATFORM_ID:Windows>:odbccp32>
+ $<$<PLATFORM_ID:Windows>:user32>
+ $<$<PLATFORM_ID:Windows>:legacy_stdio_definitions>)
install(TARGETS
MonetODBCs
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT client
+ COMPONENT odbc
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
+ COMPONENT odbc
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR}
- COMPONENT client
+ COMPONENT odbc
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT clientdev
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -53,7 +53,7 @@ if (NOT WIN32)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb5.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
- COMPONENT server)
+ COMPONENT serverdev)
endif()
install(TARGETS
@@ -74,4 +74,6 @@ install(EXPORT monetdb5Targets
FILE monetdb5Targets.cmake
NAMESPACE MonetDB::
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cmake
- COMPONENT server)
+ COMPONENT serverdev)
+
+# vim: set ts=2:sw=2:et
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -98,7 +98,8 @@ target_link_libraries(Mdiff
install(TARGETS
Mdiff
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT testing)
configure_file(Mtest.py.in
${CMAKE_CURRENT_BINARY_DIR}/Mtest.py
@@ -111,7 +112,8 @@ configure_file(listexports.py.in
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/Mtest.py
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT pytesting)
if(PYTHON3_LIBDIR)
install(FILES
@@ -122,7 +124,8 @@ if(PYTHON3_LIBDIR)
exportutils.py
malcheck.py
sqllogictest.py
- DESTINATION ${PYTHON3_LIBDIR}/MonetDBtesting)
+ DESTINATION ${PYTHON3_LIBDIR}/MonetDBtesting
+ COMPONENT pytesting)
endif()
if(WIN32)
@@ -157,16 +160,21 @@ else()
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/Mlog
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT testing)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/monetdb_mtest.sh
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
- DESTINATION ${CMAKE_INSTALL_BINDIR})
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT pytesting)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/Mtest.py
PERMISSIONS ${PROGRAM_PERMISSIONS_DEFAULT}
DESTINATION ${CMAKE_INSTALL_BINDIR}
- RENAME Mapprove.py)
+ RENAME Mapprove.py
+ COMPONENT pytesting)
endif()
+
+# vim: set ts=2:sw=2:et
diff --git a/tools/merovingian/client/CMakeLists.txt
b/tools/merovingian/client/CMakeLists.txt
--- a/tools/merovingian/client/CMakeLists.txt
+++ b/tools/merovingian/client/CMakeLists.txt
@@ -41,4 +41,7 @@ install(TARGETS
install(FILES
monetdb.1
- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
+ COMPONENT sql)
+
+# vim: set ts=2:sw=2:et
diff --git a/tools/merovingian/daemon/CMakeLists.txt
b/tools/merovingian/daemon/CMakeLists.txt
--- a/tools/merovingian/daemon/CMakeLists.txt
+++ b/tools/merovingian/daemon/CMakeLists.txt
@@ -61,14 +61,19 @@ configure_file(monetdbd.1.in
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
