diff options
| author | Wei-Yin Chen (陳威尹) <wychen@chromium.org> | 2016-09-01 17:12:49 -0700 |
|---|---|---|
| committer | Wei-Yin Chen (陳威尹) <wychen@chromium.org> | 2016-09-01 17:18:22 -0700 |
| commit | a7eaf3696725d22e40ef2689bd2e8f32749d2df0 (patch) | |
| tree | 2a8b24327f9da98e8e38fa54e0ad4113647db75f | |
| parent | 48811b2eddadf723b0685934025735163c74362f (diff) | |
| download | protobuf-a7eaf3696725d22e40ef2689bd2e8f32749d2df0.tar.gz protobuf-a7eaf3696725d22e40ef2689bd2e8f32749d2df0.tar.bz2 protobuf-a7eaf3696725d22e40ef2689bd2e8f32749d2df0.zip | |
Rename UNICODE to protobuf_UNICODE
| -rw-r--r-- | appveyor.bat | 2 | ||||
| -rw-r--r-- | cmake/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/appveyor.bat b/appveyor.bat index 58cc9355..916f4434 100644 --- a/appveyor.bat +++ b/appveyor.bat @@ -10,7 +10,7 @@ goto :error echo Building C++ mkdir 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 cd %configuration% tests.exe || goto error diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 8c374b7e..df3b2012 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -159,9 +159,9 @@ else (MSVC) set(LIB_PREFIX) endif (MSVC) -if (UNICODE) +if (protobuf_UNICODE) add_definitions(-DUNICODE -D_UNICODE) -endif (UNICODE) +endif (protobuf_UNICODE) include(libprotobuf-lite.cmake) include(libprotobuf.cmake) |