[geos-commits] [SCM] GEOS branch master updated. a252dd31edfe3e67271de4903cf94a1694d5bb33

[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  a252dd31edfe3e67271de4903cf94a1694d5bb33 (commit)
      from  2f02962c6e5cca09b6388131683f0a8517027bb9 (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 a252dd31edfe3e67271de4903cf94a1694d5bb33
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Thu Jan 31 13:09:26 2019 -0800

    Test to note MSVC+x64 to turn on ASM in ttmath

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 663f7c6..ad50d2d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,10 +15,7 @@ file(GLOB_RECURSE geos_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 file(GLOB_RECURSE geos_ALL_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h) # fix source_group issue
 
 # Building with Visual C++ x86_64 needs to compile the asm utilities first
-message(STATUS, 'CMAKE_VS_PLATFORM_NAME = ${CMAKE_VS_PLATFORM_NAME}')
-message(STATUS, 'MSVC = ${MSVC}')
-message(STATUS, 'CMAKE_SIZEOF_VOID_P = ${CMAKE_SIZEOF_VOID_P}')
-if (MSVC AND ("x${CMAKE_VS_PLATFORM_NAME}" STREQUAL "xx64"))
+if (MSVC AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8))
   set(TTMATH_MSVC64_ASM ttmathuint_x86_64_msvc.asm)
   enable_language(ASM_MASM)
   message(STATUS "Enabled MASM to compile '${TTMATH_MSVC64_ASM}'")

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

Summary of changes:
 src/CMakeLists.txt | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS