Skip to content

Commit cfe6384

Browse files
committed
Doing some cleanup and minor adjustments
1 parent 80c7615 commit cfe6384

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
graphviz \
8080
doxygen
8181
82-
- name: Configure and build
82+
- name: Configure and build
8383
run: |
8484
export PATH=/usr/lib/postgresql/${PGVER}/bin:$PATH
8585
mkdir build

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ include(pgr/Configure)
8282
#---------------------------------------------
8383
set(DOXYGEN_MINIMUM_VERSION "1.7")
8484
set(SPHINX_MINIMUM_VERSION "4.0")
85-
set(POSTGRESQL_MINIMUM_VERSION "13.0.0")
85+
set(POSTGRESQL_MINIMUM_VERSION "13")
8686
set(BOOST_MINIMUM_VERSION "1.56.0")
8787
set(POSTGIS_MINIMUM_VERSION "3.0.0")
8888

doc/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ foreach(opt BUILD_HTML BUILD_LATEX BUILD_MAN BUILD_SINGLEHTML BUILD_EPUB BUILD_D
5050
endif()
5151
endforeach()
5252

53-
message(STATUS "PROJECT_DOC_TARGETS = ${PROJECT_DOC_TARGETS}")
5453
if("${PROJECT_DOC_TARGETS}" STREQUAL "")
5554
message(WARNING "No documentation targets found
5655
Building without documentation")
@@ -145,7 +144,7 @@ message(STATUS "PGR_DOCUMENTATION_SOURCE_DIR = ${PGR_DOCUMENTATION_SOURCE_DIR}")
145144
foreach (subdir ${PROJECT_DOC_DIRECTORIES} "src")
146145
add_subdirectory("${subdir}")
147146
if (EXISTS "${CMAKE_SOURCE_DIR}/docqueries/${subdir}")
148-
add_subdirectory("${CMAKE_SOURCE_DIR}/docqueries/${subdir}" "build/doc/${subdir}")
147+
add_subdirectory("${CMAKE_SOURCE_DIR}/docqueries/${subdir}" "docqueries/${subdir}")
149148
endif()
150149
endforeach()
151150

@@ -158,10 +157,7 @@ configure_file("../tools/testers/sampledata.sql" "${PGR_DOCUMENTATION_SOURCE_DIR
158157
add_subdirectory("_static")
159158
add_subdirectory("_templates")
160159

161-
configure_file(
162-
"${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in"
163-
"${PGR_DOCUMENTATION_SOURCE_DIR}/conf.py"
164-
@ONLY)
160+
configure_file("conf.py.in" "${PGR_DOCUMENTATION_SOURCE_DIR}/conf.py" @ONLY)
165161

166162
foreach (format ${PROJECT_DOC_TARGETS})
167163

0 commit comments

Comments
 (0)