[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fdo-commits
Subject:    [fdo-commits] r7869 - sandbox/vcpkg
From:       svn_fdo () osgeo ! org
Date:       2019-09-30 15:10:25
Message-ID: 20190930151025.C8026390249 () trac ! osgeo ! org
[Download RAW message or body]

Author: jng
Date: 2019-09-30 08:10:25 -0700 (Mon, 30 Sep 2019)
New Revision: 7869

Modified:
   sandbox/vcpkg/CMakeLists.txt
Log:
The original vcxproj files have a character set of "Not Set". Our CMake windows \
builds are generating vcxproj files with character set as either multi-byte or \
unicode, which causes FDO's ConnectionManager.cpp to fail to compile. 

To replicate this in our CMake windows builds, requires us to remove the definitions \
of _MBCS and _UNICODE and adding a definition of _SBCS

This file now compiles.

Modified: sandbox/vcpkg/CMakeLists.txt
===================================================================
--- sandbox/vcpkg/CMakeLists.txt	2019-09-30 14:38:16 UTC (rev 7868)
+++ sandbox/vcpkg/CMakeLists.txt	2019-09-30 15:10:25 UTC (rev 7869)
@@ -167,7 +167,9 @@
 endif( UNIX )
 
 if (MSVC)
-    add_definitions(-D_UNICODE)
+    remove_definitions(-D_MBCS)
+    remove_definitions(-D_UNICODE)
+    add_definitions(-D_SBCS)
 endif (MSVC)
 
 if (CMAKE_SYSTEM_NAME MATCHES Linux)

_______________________________________________
fdo-commits mailing list
fdo-commits@lists.osgeo.org
https://lists.osgeo.org/mailman/listinfo/fdo-commits


[prev in list] [next in list] [prev in thread] [next in thread]