[geos-commits] [SCM] geos branch master updated. 780221a5aa171f247d097f95cfbbde2049811ab2

[git at osgeo.org]

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  780221a5aa171f247d097f95cfbbde2049811ab2 (commit)
       via  af73ed20ed0ec0a610551090fdd8c8da8a66727d (commit)
      from  6731fd9002ad2f6cfbf0c97dfc469db3527899cb (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 780221a5aa171f247d097f95cfbbde2049811ab2
Author: Mateusz Loskot <mateusz at loskot.net>
Date:   Mon Sep 11 17:03:31 2017 +0200

    [CMake] Remove checks for prehistoric versions of Visual Studio

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9684781..8a5b2d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,16 +143,8 @@ elseif(MSVC)
   #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
   string(REGEX REPLACE "/W[0-9]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
-  if(NOT (MSVC_VERSION LESS 1400)) # Visual Studio 2005 or later
-
-    # Option is to enable the /MP switch for Visual Studio 2005 or later
-    option(GEOS_MSVC_ENABLE_MP
-      "Set to ON to build GEOS with the /MP option (Visual Studio 2005 and above)." ON)
-    mark_as_advanced(GEOS_MSVC_ENABLE_MP)
-    if(GEOS_MSVC_ENABLE_MP)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-    endif()
-    message(STATUS "Setting Visual Studio 2005+ option /MP to ${GEOS_MSVC_ENABLE_MP}")
+  if(MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 
     add_definitions(-D_SCL_SECURE_NO_WARNINGS)
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)

commit af73ed20ed0ec0a610551090fdd8c8da8a66727d
Author: Mateusz Loskot <mateusz at loskot.net>
Date:   Mon Sep 11 17:03:09 2017 +0200

    [CMake] No need to run cmake.exe in VS command prompt
    
    [ci skip]

diff --git a/tools/build-cmake.bat b/tools/build-cmake.bat
index 4705e50..befb2ad 100644
--- a/tools/build-cmake.bat
+++ b/tools/build-cmake.bat
@@ -11,7 +11,6 @@ rem 4. Optionally, run devenv.exe {project}{32|64}.sln from command line
 rem ### CONFIGURATION #####################################
 rem #######################################################
 
-if not defined VS150COMNTOOLS goto :NoVS
 if [%1]==[] goto :Usage
 if [%1]==[32] goto :32
 if [%1]==[64] goto :64
@@ -41,12 +40,6 @@ REM msbuild.exe geos%GEOSP%.sln /p:Configuration=Release /p:Platform=%MSBUILDP%
 popd
 goto :EOF
 
-:NoVS
- at echo build.bat
- at echo  Visual Studio 2017 not found
- at echo  "%%VS150COMNTOOLS%%" environment variable not defined
-exit /B 1
-
 :Usage
 @echo build.bat
 @echo Usage: build.bat [32 or 64]

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

Summary of changes:
 CMakeLists.txt        |   12 ++----------
 tools/build-cmake.bat |    7 -------
 2 files changed, 2 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
geos