You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by ve...@apache.org on 2013/03/25 10:39:39 UTC
svn commit: r1460564 - in /etch/trunk/binding-cpp/runtime:
src/test/CMakeLists.txt toolchains/Windows_X86_32.toolchain
Author: veithm
Date: Mon Mar 25 09:39:38 2013
New Revision: 1460564
URL: http://svn.apache.org/r1460564
Log:
ETCH-262 Enabling unit tests build of cpp binding with Visual Studio 11
Change-Id: I71c4a934bfb965707e905262289fc71423dc6a0c
Modified:
etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain
Modified: etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt?rev=1460564&r1=1460563&r2=1460564&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt (original)
+++ etch/trunk/binding-cpp/runtime/src/test/CMakeLists.txt Mon Mar 25 09:39:38 2013
@@ -24,9 +24,11 @@ include_directories (${GMOCK}/include)
include_directories (${CAPU}/include/capu)
-IF (TARGET_OS STREQUAL "Windows" AND BUILD_CHECK_MEMORY)
- include_directories (${VLD}/include)
- add_definitions (-DBUILD_CHECK_MEMORY)
+IF (TARGET_OS STREQUAL "Windows")
+ IF (BUILD_CHECK_MEMORY)
+ include_directories (${VLD}/include)
+ add_definitions (-DBUILD_CHECK_MEMORY)
+ ENDIF()
ENDIF ()
IF (TARGET_OS STREQUAL "Linux")
Modified: etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain?rev=1460564&r1=1460563&r2=1460564&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain (original)
+++ etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain Mon Mar 25 09:39:38 2013
@@ -31,6 +31,7 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLA
add_definitions("-DOS_WINDOWS")
add_definitions("-DARCH_X86_32")
+add_definitions("-D_VARIADIC_MAX=10") #this is needed for compiling gtest with visual studio 11
# enable the BUILD_CHECK_MEMORY flag if you would like to check for memory leaks with visual leak detector
#add_definitions("-DBUILD_CHECK_MEMORY")