Changeset: 97abeeaa52a2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97abeeaa52a2
Modified Files:
cmake/monetdb-findpackages.cmake
cmake/monetdb-functions.cmake
cmake/monetdb-options.cmake
documentation/CMakeLists.txt
Branch: default
Log Message:
improve sphinx setup
diffs (52 lines):
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -128,4 +128,6 @@ if(RINTEGRATION)
find_package(LibR)
endif()
+find_package(Sphinx)
+
# vim: set ts=2:sw=2:et
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -142,6 +142,7 @@ function(monetdb_cmake_summary)
message(STATUS "Netcdf library: ${NETCDF_FOUND}")
message(STATUS "Readline library: ${READLINE_FOUND}")
message(STATUS "R library: ${LIBR_FOUND}")
+ message(STATUS "Sphinx: ${SPHINX_FOUND}")
message(STATUS "-----------------------------------------")
message(STATUS "")
endfunction()
diff --git a/cmake/monetdb-options.cmake b/cmake/monetdb-options.cmake
--- a/cmake/monetdb-options.cmake
+++ b/cmake/monetdb-options.cmake
@@ -18,7 +18,7 @@ else()
endif()
option(TESTING
- "Enable support for testing"
+ "Enable support for testing"
ON)
cmake_dependent_option(CINTEGRATION
diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -1,6 +1,12 @@
-find_package(Sphinx)
-
-if(SPHINX_EXECUTABLE)
+#[[
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+#]]
+
+if(SPHINX_FOUND)
if(NOT DEFINED SPHINX_THEME)
set(SPHINX_THEME default)
endif()
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
