Changeset: d16f6546dfca for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d16f6546dfca
Modified Files:
clients/mapiclient/CMakeLists.txt
common/options/CMakeLists.txt
common/utils/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
monetdb5/modules/atoms/CMakeLists.txt
monetdb5/modules/kernel/CMakeLists.txt
monetdb5/modules/mal/CMakeLists.txt
monetdb5/optimizer/CMakeLists.txt
monetdb5/scheduler/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
sql/common/CMakeLists.txt
sql/include/CMakeLists.txt
sql/server/CMakeLists.txt
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
tools/merovingian/utils/CMakeLists.txt
Branch: oscar
Log Message:
Don't install every file in sight.
diffs (truncated from 335 to 300 lines):
diff --git a/clients/mapiclient/CMakeLists.txt
b/clients/mapiclient/CMakeLists.txt
--- a/clients/mapiclient/CMakeLists.txt
+++ b/clients/mapiclient/CMakeLists.txt
@@ -85,18 +85,6 @@ target_link_libraries(stethoscope
$<$<PLATFORM_ID:Windows>:ws2_32>)
install(TARGETS
- mcutil
- RUNTIME
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-install(TARGETS
mclient
msqldump
RUNTIME
diff --git a/common/options/CMakeLists.txt b/common/options/CMakeLists.txt
--- a/common/options/CMakeLists.txt
+++ b/common/options/CMakeLists.txt
@@ -36,14 +36,9 @@ set_target_properties(moptions
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER "${moptions_public_headers}")
-install(TARGETS
- moptions
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
+install(FILES
+ monet_options.h
+ monet_getopt.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT
monetdbdev)
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -145,21 +145,6 @@ set_target_properties(mprompt
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER mprompt.h)
-install(TARGETS
- mutils
- mcrypt
- msabaoth
- mprompt
- RUNTIME
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
# We need to define the matomic target because it is a public
# dependency of gdk.
install(TARGETS
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -18,9 +18,6 @@ if(GEOS_FOUND)
path "${CMAKE_SOURCE_DIR}/geom/sql"
modules_list ${include_sql_files})
- set(geomodule_public_headers
- ${CMAKE_CURRENT_SOURCE_DIR}/geom.h)
-
target_sources(geomodule
PRIVATE
geom.c
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -8,16 +8,16 @@
set(mal_public_headers
${CMAKE_CURRENT_SOURCE_DIR}/mal.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_linker.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_authorize.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_client.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_errors.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_exception.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_instruction.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_import.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_stack.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_instruction.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_linker.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_namespace.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_errors.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_client.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_authorize.h)
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_stack.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h)
add_library(mal OBJECT)
@@ -88,10 +88,6 @@ set_target_properties(mal
install(TARGETS
mal
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
PUBLIC_HEADER
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT serverdev
diff --git a/monetdb5/modules/atoms/CMakeLists.txt
b/monetdb5/modules/atoms/CMakeLists.txt
--- a/monetdb5/modules/atoms/CMakeLists.txt
+++ b/monetdb5/modules/atoms/CMakeLists.txt
@@ -69,13 +69,3 @@ set_target_properties(atoms
PROPERTIES
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/mtime.h)
-
-install(TARGETS
- atoms
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -53,16 +53,6 @@ set_target_properties(kernel
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/bat5.h)
-install(TARGETS
- kernel
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
install(FILES
microbenchmark.mal
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
diff --git a/monetdb5/modules/mal/CMakeLists.txt
b/monetdb5/modules/mal/CMakeLists.txt
--- a/monetdb5/modules/mal/CMakeLists.txt
+++ b/monetdb5/modules/mal/CMakeLists.txt
@@ -75,13 +75,3 @@ set_target_properties(malmodules
PROPERTIES
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/wlc.h)
-
-install(TARGETS
- malmodules
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/monetdb5/optimizer/CMakeLists.txt
b/monetdb5/optimizer/CMakeLists.txt
--- a/monetdb5/optimizer/CMakeLists.txt
+++ b/monetdb5/optimizer/CMakeLists.txt
@@ -76,13 +76,3 @@ set_target_properties(optimizer
PROPERTIES
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/opt_pipes.h)
-
-install(TARGETS
- optimizer
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/monetdb5/scheduler/CMakeLists.txt
b/monetdb5/scheduler/CMakeLists.txt
--- a/monetdb5/scheduler/CMakeLists.txt
+++ b/monetdb5/scheduler/CMakeLists.txt
@@ -42,16 +42,6 @@ set_target_properties(scheduler
PROPERTIES
POSITION_INDEPENDENT_CODE ON)
-install(TARGETS
- scheduler
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
install(FILES
run_adder.mal
run_isolate.mal
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -118,8 +118,7 @@ set_target_properties(sql
PROPERTIES
OUTPUT_NAME _sql
VERSION ${MONETDB_VERSION}
- SOVERSION ${MONETDB_VERSION_MAJOR}
- PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/sql_import.h)
+ SOVERSION ${MONETDB_VERSION_MAJOR})
target_compile_definitions(sql
PRIVATE
@@ -140,10 +139,7 @@ install(TARGETS
COMPONENT sql
NAMELINK_COMPONENT monetdbdev
ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
add_subdirectory(generator)
add_subdirectory(UDF)
diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt
--- a/sql/common/CMakeLists.txt
+++ b/sql/common/CMakeLists.txt
@@ -52,13 +52,3 @@ set_target_properties(sqlcommon
PROPERTIES
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/sql_types.h)
-
-install(TARGETS
- sqlcommon
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/sql/include/CMakeLists.txt b/sql/include/CMakeLists.txt
--- a/sql/include/CMakeLists.txt
+++ b/sql/include/CMakeLists.txt
@@ -21,8 +21,3 @@ target_include_directories(sqlinclude
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-
-install(FILES
- ${sqlinclude_public_headers}
- DESTINATION
- ${CMAKE_INSTALL_INCLUDEDIR}/monetdb)
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -115,13 +115,3 @@ set_target_properties(sqlserver
PROPERTIES
POSITION_INDEPENDENT_CODE ON
PUBLIC_HEADER "${sqlserver_public_headers}")
-
-install(TARGETS
- sqlserver
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/sql/storage/CMakeLists.txt b/sql/storage/CMakeLists.txt
--- a/sql/storage/CMakeLists.txt
+++ b/sql/storage/CMakeLists.txt
@@ -47,14 +47,4 @@ target_compile_definitions(sqlstorage
LIBBATSTORE
LIBSTORE)
-install(TARGETS
- sqlstorage
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
add_subdirectory(bat)
diff --git a/sql/storage/bat/CMakeLists.txt b/sql/storage/bat/CMakeLists.txt
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
