Changeset: 71fc4c14752a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71fc4c14752a
Modified Files:
common/options/CMakeLists.txt
common/stream/CMakeLists.txt
geom/lib/CMakeLists.txt
geom/monetdb5/CMakeLists.txt
monetdb5/mal/CMakeLists.txt
sql/backends/monet5/CMakeLists.txt
Branch: default
Log Message:
cleanup public header definitions
diffs (112 lines):
diff --git a/common/options/CMakeLists.txt b/common/options/CMakeLists.txt
--- a/common/options/CMakeLists.txt
+++ b/common/options/CMakeLists.txt
@@ -31,10 +31,6 @@ target_link_libraries(moptions
monetdb_config_header
$<$<PLATFORM_ID:Windows>:${GETOPT_LIB}>)
-#if(WIN32)
-# target_compile_definitions(moptions PRIVATE LIBMOPTIONS LIBGDK LIBMAPI)
-#endif()
-
set_target_properties(moptions
PROPERTIES
POSITION_INDEPENDENT_CODE ON
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -7,10 +7,10 @@
#]]
set(stream_public_headers
- $<BUILD_INTERFACE:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/stream.h>
-
$<BUILD_INTERFACE:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/stream_socket.h>
-
$<INSTALL_INTERFACE:$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>/stream.h>
-
$<INSTALL_INTERFACE:$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>/stream_socket.h>)
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stream.h>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/stream_socket.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/stream.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/stream_socket.h>)
add_library(stream
SHARED)
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
--- a/geom/lib/CMakeLists.txt
+++ b/geom/lib/CMakeLists.txt
@@ -30,8 +30,7 @@ if(GEOS_FOUND)
set_target_properties(geomlib
PROPERTIES
- POSITION_INDEPENDENT_CODE ON
- PUBLIC_HEADER "${sqlserver_public_headers}")
+ POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(geomlib PRIVATE LIBGEOM)
endif()
diff --git a/geom/monetdb5/CMakeLists.txt b/geom/monetdb5/CMakeLists.txt
--- a/geom/monetdb5/CMakeLists.txt
+++ b/geom/monetdb5/CMakeLists.txt
@@ -9,18 +9,9 @@
if(GEOS_FOUND)
add_library(geomodule MODULE)
- #set(include_mal_files
- # geom
- # geom_funcs)
-
set(include_sql_files
40_geom)
- #create_include_object(
- # MAL_LANGUAGE
- # name_module "geomodule"
- # modules_list ${include_mal_files})
-
create_include_object(
SQL_LANGUAGE
name_module "geomodule"
@@ -35,7 +26,6 @@ if(GEOS_FOUND)
geom.c
geomBulk.c
geom_upgrade.c
- # ${MONETDB_CURRENT_MAL_SOURCES}
${MONETDB_CURRENT_SQL_SOURCES}
PUBLIC
${geomodule_public_headers})
diff --git a/monetdb5/mal/CMakeLists.txt b/monetdb5/mal/CMakeLists.txt
--- a/monetdb5/mal/CMakeLists.txt
+++ b/monetdb5/mal/CMakeLists.txt
@@ -15,7 +15,9 @@ set(mal_public_headers
${CMAKE_CURRENT_SOURCE_DIR}/mal_type.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_stack.h
${CMAKE_CURRENT_SOURCE_DIR}/mal_namespace.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_errors.h)
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_errors.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_client.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/mal_authorize.h)
add_library(mal OBJECT)
@@ -53,8 +55,6 @@ target_sources(mal
mal_prelude.c
mel.h
PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_client.h
- ${CMAKE_CURRENT_SOURCE_DIR}/mal_authorize.h
${mal_public_headers})
target_include_directories(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
@@ -7,8 +7,8 @@
#]]
set(sql_public_headers
-
$<BUILD_INTERFACE:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/sql_import.h>
-
$<INSTALL_INTERFACE:$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>/sql_import.h>)
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sql_import.h>
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb/sql_import.h>)
#add_library(sql MODULE)
add_library(sql SHARED)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
