organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Rename UNICODE to protobuf_UNICODE

Browse source
This commit is contained in:
Wei-Yin Chen (陳威尹) 2016-09-01 17:12:49 -07:00
parent 48811b2edd
commit a7eaf36967
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appveyor.bat
View file

@ -10,7 +10,7 @@ goto :error
echo Building C++ echo Building C++
mkdir build_msvc mkdir build_msvc
cd build_msvc cd build_msvc
cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% -DUNICODE=%UNICODE% ../cmake cmake -G "%generator%" -Dprotobuf_BUILD_SHARED_LIBS=%BUILD_DLL% -Dprotobuf_UNICODE=%UNICODE% ../cmake
msbuild protobuf.sln /p:Platform=%vcplatform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error msbuild protobuf.sln /p:Platform=%vcplatform% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" || goto error
cd %configuration% cd %configuration%
tests.exe || goto error tests.exe || goto error

4
cmake/CMakeLists.txt
View file

@ -159,9 +159,9 @@ else (MSVC)
set(LIB_PREFIX) set(LIB_PREFIX)
endif (MSVC) endif (MSVC)
if (UNICODE) if (protobuf_UNICODE)
add_definitions(-DUNICODE -D_UNICODE) add_definitions(-DUNICODE -D_UNICODE)
endif (UNICODE) endif (protobuf_UNICODE)
include(libprotobuf-lite.cmake) include(libprotobuf-lite.cmake)
include(libprotobuf.cmake) include(libprotobuf.cmake)