[geos-commits] [SCM] geos branch master updated. 080d94701ce900494898c5fe78c53a1db72a5f4c

git at osgeo.org git at osgeo.org
Tue Aug 29 08:24:27 PDT 2017


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, master has been updated
       via  080d94701ce900494898c5fe78c53a1db72a5f4c (commit)
      from  ec5e78da7c79bbb1a5c413ee62f0368776deda53 (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 080d94701ce900494898c5fe78c53a1db72a5f4c
Author: Mateusz Loskot <mateusz at loskot.net>
Date:   Tue Aug 29 17:22:59 2017 +0200

    [CMake] Add LANGUAGES property to project command
    
    Note, VERSION property components must be integers,
    and cannot be added due to 'dev' suffix in VERSION_PATCH.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db77b67..fe6d50d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@
 # See the COPYING file for more information.
 #
 #################################################################################
-project(GEOS)
 cmake_minimum_required(VERSION 3.0.0)
 
 if(NOT CMAKE_VERSION)
@@ -18,9 +17,6 @@ if(NOT CMAKE_VERSION)
       "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}")
 endif()
 
-# Add custom GEOS modules for CMake
-list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
-
 #################################################################################
 # Setup GEOS version
 #################################################################################
@@ -52,6 +48,14 @@ if (NOT WIN32)
 endif()
 
 #################################################################################
+# Set GEOS project
+#################################################################################
+project(GEOS LANGUAGES C CXX)
+
+# Add custom GEOS modules for CMake
+list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
+
+#################################################################################
 # Check custom global options
 #################################################################################
 

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
geos


More information about the geos-commits mailing list