[geos-commits] [SCM] GEOS branch main updated. 3972990a4746966a2b33932c71b9087b8b87c9dc
git at osgeo.org
git at osgeo.org
Thu Sep 30 14:34:34 PDT 2021
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".
The branch, main has been updated
via 3972990a4746966a2b33932c71b9087b8b87c9dc (commit)
from 97c55f5a82b63cdeaa5ca149ed81190ae35c9434 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3972990a4746966a2b33932c71b9087b8b87c9dc
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Thu Sep 30 14:34:30 2021 -0700
Move GNUInstallDirs under the project() definition to avoid cmake warning
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f92e84..b87c32a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,9 +72,6 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
message(STATUS "GEOS: Run-time output: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
message(STATUS "GEOS: Archives output: ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
-include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
-
#-----------------------------------------------------------------------------
# Version
#-----------------------------------------------------------------------------
@@ -145,6 +142,13 @@ message(STATUS "GEOS: C API Version ${CAPI_VERSION}")
message(STATUS "GEOS: JTS port ${JTS_PORT}")
#-----------------------------------------------------------------------------
+# Install directories
+#-----------------------------------------------------------------------------
+
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+#-----------------------------------------------------------------------------
# C++ language version and compilation flags
#-----------------------------------------------------------------------------
message(STATUS "GEOS: Require C++${CMAKE_CXX_STANDARD}")
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
GEOS
More information about the geos-commits
mailing list