Changeset: a6166b836c6c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a6166b836c6c
Modified Files:
MonetDB.spec
cmake/monetdb-options.cmake
debian/rules
sql/server/CMakeLists.txt
Branch: clean_parser
Log Message:
Don't create sqlparse binary for Linux releases.
diffs (78 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -923,6 +923,7 @@ sed -i 's/1\.2/1.1/' misc/selinux/monetd
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
+ -DWITH_SQLPARSE=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake
--- a/cmake/monetdb-options.cmake
+++ b/cmake/monetdb-options.cmake
@@ -31,6 +31,10 @@ cmake_dependent_option(CINTEGRATION
"NOT WIN32"
OFF)
+option(WITH_SQLPARSE
+ "Compile and install the sqlparse utility (default=ON)"
+ ON)
+
option(WITH_RTREE
"Enable support for rtrees (librtree; default=ON)"
ON)
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,7 @@ override_dh_auto_configure:
-DWITH_PCRE=ON \
-DWITH_PROJ=OFF \
-DWITH_READLINE=ON \
+ -DWITH_SQLPARSE=OFF \
-DWITH_VALGRIND=OFF \
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -130,6 +130,7 @@ if(NOT MONETDB_STATIC)
PUBLIC_HEADER "${sqlserver_public_headers}")
endif()
+if(WITH_SQLPARSE)
add_executable(sqlparse)
target_sources(sqlparse
@@ -174,24 +175,16 @@ target_link_libraries(sqlparse
set_target_properties(sqlparse
PROPERTIES
VERSION ${MONETDB_VERSION})
+install(TARGETS
+ sqlparse
+ RUNTIME
+ DESTINATION ${CMAKE_INSTALL_BINDIR}
+ COMPONENT server)
+endif()
if(MONETDB_STATIC)
install(TARGETS
sqlserver
- sqlparse
- RUNTIME
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- COMPONENT server
- LIBRARY
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE
- DESTINATION ${CMAKE_INSTALL_LIBDIR}
- PUBLIC_HEADER
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-else()
-install(TARGETS
- sqlparse
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT server
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
