Changeset: 809fe916632c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=809fe916632c
Modified Files:
CMakeLists.txt
clients/CMakeLists.txt
tools/CMakeLists.txt
tools/mserver/CMakeLists.txt
tools/mserver/mserver5.1.in
Branch: cmake-fun
Log Message:
Make compilation more restriction when some options are off.
diffs (78 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -770,11 +770,11 @@ endif()
if(HAVE_MONETDB5)
add_subdirectory(monetdb5)
add_subdirectory(geom) # The SHP vault requires the geom module, so the
geom module should compile before SQL
+ add_subdirectory(tools)
endif()
if(HAVE_SQL)
add_subdirectory(sql)
endif()
-add_subdirectory(tools)
if(HAVE_TESTING)
add_subdirectory(testing) # This one must be the last visted directory!
endif()
diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -6,15 +6,17 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
#]]
-if(${ENABLE_MAPI} STREQUAL "YES")
+if(NOT ${ENABLE_MAPI} STREQUAL "NO")
set(HAVE_MAPI ON CACHE INTERNAL "mapi extension is available" FORCE)
add_subdirectory(mapilib)
add_subdirectory(mapiclient)
add_subdirectory(examples)
+ if(WIN32)
+ add_subdirectory(NT)
+ endif()
else()
set(HAVE_MAPI OFF CACHE INTERNAL "mapi extension is available" FORCE)
endif()
-add_subdirectory(odbc)
-if(WIN32)
- add_subdirectory(NT)
+if(NOT ${ENABLE_ODBC} STREQUAL "NO")
+ add_subdirectory(odbc)
endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -8,7 +8,7 @@
if(HAVE_MONETDB5)
add_subdirectory(mserver)
+ if(NOT WIN32)
+ add_subdirectory(merovingian)
+ endif()
endif()
-if(NOT WIN32)
- add_subdirectory(merovingian)
-endif()
diff --git a/tools/mserver/CMakeLists.txt b/tools/mserver/CMakeLists.txt
--- a/tools/mserver/CMakeLists.txt
+++ b/tools/mserver/CMakeLists.txt
@@ -31,7 +31,6 @@ install(FILES monetdblogo.png DESTINATIO
if(WIN32)
install(FILES $<TARGET_PDB_FILE:mserver5> DESTINATION ${BINDIR}
OPTIONAL)
else()
- set(localstatedir "${LOCALSTATEDIR}")
configure_file(mserver5.1.in ${CMAKE_CURRENT_BINARY_DIR}/mserver5.1
@ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mserver5.1 DESTINATION
${MANDIR}/man1)
endif()
diff --git a/tools/mserver/mserver5.1.in b/tools/mserver/mserver5.1.in
--- a/tools/mserver/mserver5.1.in
+++ b/tools/mserver/mserver5.1.in
@@ -64,7 +64,7 @@ should find a database.
Shorthand for option
.BR gdk_dbpath .
Default value:
-.BR @localstatedir@/monetdb5/dbfarm/demo .
+.BR @LOCALSTATEDIR@/monetdb5/dbfarm/demo .
.TP
\fB\-\-dbextra=\fP\fIpath\fP
Path where mserver5 should store transient data. Default value is the
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
