etch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vei...@apache.org
Subject svn commit: r1579900 - in /etch/trunk/binding-cpp/runtime: ./ toolchains/
Date Fri, 21 Mar 2014 08:52:10 GMT
Author: veithm
Date: Fri Mar 21 08:52:09 2014
New Revision: 1579900

URL: http://svn.apache.org/r1579900
Log:
ETCH-292 Enable build for several platforms in a row

In order to be able to build several platforms in a row the build
artifacts must be stored in separate folders. Therefore the build folder
now containes the platform specifications like operating system and
architecture.

Change-Id: I75ce8e174b4944ed72324bce0497ee7f7d50a4b1

Added:
    etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_32.toolchain   (contents, props changed)
      - copied, changed from r1579585, etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain
Modified:
    etch/trunk/binding-cpp/runtime/CMakeLists.txt
    etch/trunk/binding-cpp/runtime/FindCapu.cmake
    etch/trunk/binding-cpp/runtime/build.properties
    etch/trunk/binding-cpp/runtime/build.xml
    etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain   (contents, props changed)
    etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain   (contents, props
changed)
    etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain   (contents, props
changed)

Modified: etch/trunk/binding-cpp/runtime/CMakeLists.txt
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/CMakeLists.txt?rev=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/CMakeLists.txt (original)
+++ etch/trunk/binding-cpp/runtime/CMakeLists.txt Fri Mar 21 08:52:09 2014
@@ -1,24 +1,24 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more 
-# contributor license agreements. See the NOTICE file distributed with  
-# this work for additional information regarding copyright ownership. 
-# The ASF licenses this file to you under the Apache License, Version  
-# 2.0 (the "License"); you may not use this file except in compliance  
-# with the License. You may obtain a copy of the License at 
-# 
-# http://www.apache.org/licenses/LICENSE-2.0 
-# 
-# Unless required by applicable law or agreed to in writing, software 
-# distributed under the License is distributed on an "AS IS" BASIS, 
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and 
-# limitations under the License. 
-#
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
+# contributor license agreements. See the NOTICE file distributed with  
+# this work for additional information regarding copyright ownership. 
+# The ASF licenses this file to you under the Apache License, Version  
+# 2.0 (the "License"); you may not use this file except in compliance  
+# with the License. You may obtain a copy of the License at 
+# 
+# http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and 
+# limitations under the License. 
+#
 cmake_minimum_required (VERSION 2.8)
-project (etch-cpp)
-
-message (STATUS "using external libraries ${ETCH_EXTERNAL_DEPENDS}")
-
+project (etch-cpp)
+
+message (STATUS "using external libraries ${ETCH_EXTERNAL_DEPENDS}")
+
 IF (EXISTS "${CMAKE_SOURCE_DIR}/CMakeLists_local.txt")
 INCLUDE ("${CMAKE_SOURCE_DIR}/CMakeLists_local.txt" OPTIONAL)
 ENDIF()
@@ -28,19 +28,19 @@ IF ("${BUILD_CHECK_MEMORY}" STREQUAL "")
   SET(BUILD_CHECK_MEMORY FALSE)
 ENDIF()
 
-# Etch external
-IF (NOT ETCH_EXTERNAL_DEPENDS)
-  MESSAGE (FATAL_ERROR "ETCH_EXTERNAL_DEPENDS not set")
-ENDIF (NOT ETCH_EXTERNAL_DEPENDS)
-
+# Etch external
+IF (NOT ETCH_EXTERNAL_DEPENDS)
+  MESSAGE (FATAL_ERROR "ETCH_EXTERNAL_DEPENDS not set")
+ENDIF (NOT ETCH_EXTERNAL_DEPENDS)
+
 # Check Toolchain file
 IF (NOT CMAKE_TOOLCHAIN_FILE)
   MESSAGE (FATAL_ERROR "CMAKE_TOOLCHAIN_FILE not set")
 ENDIF (NOT CMAKE_TOOLCHAIN_FILE)
 
-#VLD
-SET(VLD ${ETCH_EXTERNAL_DEPENDS}/vld/1.9h)
-
+#VLD
+SET(VLD ${ETCH_EXTERNAL_DEPENDS}/vld/1.9h)
+
 # GMock
 SET(GMOCK ${ETCH_EXTERNAL_DEPENDS}/gmock/1.6.0)
 
@@ -50,27 +50,30 @@ SET(GTEST ${GMOCK}/gtest)
 #Build external CAPU project (OS Abstraction)
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
 find_package(Capu)
-
-include (${CMAKE_TOOLCHAIN_FILE})
 
-# Set definitions
+include (${CMAKE_TOOLCHAIN_FILE})
+
+# Set definitions
 IF (TARGET_OS STREQUAL "Linux")
-  add_definitions (-D_GNU_SOURCE -D_REENTRANT -DLINUX=2 -D__LINUX__)
+  add_definitions (-D_GNU_SOURCE -D_REENTRANT -DLINUX=2 -D__LINUX__)
 ENDIF ()
-add_definitions (-D_UNICODE -DUNICODE)
-
+add_definitions (-D_UNICODE -DUNICODE)
+
 #set cmake output variables
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
-# etch libary
-add_subdirectory (src/main)
-# etch libary tests
-add_subdirectory (src/test)
+# etch libary
+add_subdirectory (src/main)
+# etch libary tests
+
+IF(CONFIG_BUILD_TESTS)
+  add_subdirectory (src/test)
+ENDIF()
 
 #install capu headers and library
-INSTALL(DIRECTORY ${LIBCAPU_INCLUDE_DIR}/capu DESTINATION "${ETCH_INSTALL_DIR}/include")
+INSTALL(DIRECTORY ${LIBCAPU_INCLUDE_DIR}/capu DESTINATION "${ETCH_INSTALL_DIR}/include")
 
 INSTALL(DIRECTORY ${LIBCAPU_LIBRARY_DIR}/ DESTINATION "${ETCH_INSTALL_DIR}/lib/${ETCH_TARGET_PLATFORM}/${CMAKE_BUILD_TYPE}"
FILES_MATCHING PATTERN "*capu*" PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE
GROUP_READ)
 IF (NOT ${LIBCAPU_BINARY_DIR} STREQUAL "")

Modified: etch/trunk/binding-cpp/runtime/FindCapu.cmake
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/FindCapu.cmake?rev=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/FindCapu.cmake (original)
+++ etch/trunk/binding-cpp/runtime/FindCapu.cmake Fri Mar 21 08:52:09 2014
@@ -34,23 +34,24 @@ IF ("${CAPU_INCLUDE_DIR}" STREQUAL "" AN
     IF ("${LOCAL_CAPU_SOURCE_DIR}" STREQUAL "")
         #download capu from foreign repository
         SET(CAPU_PROJECT_DIR "${CMAKE_BINARY_DIR}/3rd/capu")
-        SET(CAPU_CMAKE_BUILD_DIR "${CMAKE_BINARY_DIR}/capu")
-        
+        SET(CAPU_CMAKE_BUILD_DIR "${CAPU_BUILD_DIR}/${TARGET_OS}_${TARGET_ARCH}")
+
         ExternalProject_Add(
             Capu
             URL https://github.com/bmwcarit/capu/zipball/master/bmwcarit-capu-v0.13.0-34-g0ca0967.zip
             SOURCE_DIR "${CAPU_PROJECT_DIR}"
             BINARY_DIR "${CAPU_CMAKE_BUILD_DIR}"
-            INSTALL_DIR "${CAPU_PROJECT_DIR}/deliverable"
+            INSTALL_DIR "${CAPU_BUILD_DIR}/deliverable"
             UPDATE_COMMAND ""
             CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
+                       -DCMAKE_INSTALL_PREFIX:STRING=${CAPU_BUILD_DIR}/deliverable/${TARGET_OS}_${TARGET_ARCH}/${CMAKE_BUILD_TYPE}
                        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
                        -DCONFIG_BUILD_UNITTESTS:BOOLEAN=${CONFIG_BUILD_UNITTESTS}
                        INSTALL 1
         )
     ELSE()
         SET(CAPU_PROJECT_DIR "${LOCAL_CAPU_SOURCE_DIR}")
-        SET(CAPU_CMAKE_BUILD_DIR "${CAPU_PROJECT_DIR}/build_${TARGET_OS}_${TARGET_ARCH}")
+        SET(CAPU_CMAKE_BUILD_DIR "${CAPU_BUILD_DIR}/${TARGET_OS}_${TARGET_ARCH}")
 
         ExternalProject_Add(
             Capu
@@ -58,16 +59,16 @@ IF ("${CAPU_INCLUDE_DIR}" STREQUAL "" AN
             BINARY_DIR "${CAPU_CMAKE_BUILD_DIR}"
             DOWNLOAD_COMMAND ""
             UPDATE_COMMAND ""
-            INSTALL_DIR "${CAPU_PROJECT_DIR}/deliverable"
+            INSTALL_DIR "${CAPU_BUILD_DIR}/deliverable"
             CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
+                       -DCMAKE_INSTALL_PREFIX:STRING=${CAPU_BUILD_DIR}/deliverable/${TARGET_OS}_${TARGET_ARCH}/${CMAKE_BUILD_TYPE}
                        -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-                       -DBUILD_DynamicTestLibraryProject:BOOL=1
-                       -DBUILD_GoogleMock:BOOL=0
-                       -DCONFIG_BUILD_UNITTESTS:BOOL=0
+                       -DCONFIG_BUILD_UNITTESTS:BOOL=${CONFIG_BUILD_UNITTESTS}
+                       INSTALL 1
         )
     ENDIF()
-    
-    SET(CAPU_DELIVERABLE_DIR ${CAPU_PROJECT_DIR}/deliverable/${TARGET_OS}_${TARGET_ARCH}/${CMAKE_BUILD_TYPE})
+
+    SET(CAPU_DELIVERABLE_DIR ${CAPU_BUILD_DIR}/deliverable/${TARGET_OS}_${TARGET_ARCH}/${CMAKE_BUILD_TYPE})
 
     SET(LIBCAPU_INCLUDE_DIR ${CAPU_DELIVERABLE_DIR}/include)
     SET(LIBCAPU_LIBRARY_DIR ${CAPU_DELIVERABLE_DIR}/lib)

Modified: etch/trunk/binding-cpp/runtime/build.properties
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/build.properties?rev=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/build.properties (original)
+++ etch/trunk/binding-cpp/runtime/build.properties Fri Mar 21 08:52:09 2014
@@ -1,15 +1,37 @@
-#Set the platforms which should be build by running ant
-
-
-#target.platforms=Windows_X86_32, QNX_X86_32
-#target.platforms.Windows_X86_32.generator=Visual Studio 8 2005
-#target.platforms.QNX_X86_32.generator=Unix Makefiles
-
-#preventing execution of tests
-#target.platforms.QNX_X86_32.crosscompile=1
-
-
-#target.platforms=Linux_X86_32, Linux_ARMv7l
-#target.platforms.Linux_X86_32.generator=Unix Makefiles
-#target.platforms.Linux_ARMv7l.generator=Unix Makefiles
-#target.platforms.Linux_ARMv7l.crosscompile=1
+# Set the platforms which should be build by running ant
+# Possible Targets:
+#
+# Windows_X86_32
+# Windows_X86_64
+# Linux_X86_32
+# Linux_X86_64
+# QNX_X86_32
+# iPhoneOS_ARMV7_32
+# iPhoneOS_ARMV7S_32
+# iPhoneSimulatorOS_X86_32
+# iPhoneOS_ARM64
+# iPhoneSimulatorOS_X86_64
+# MacOSX_X86_32
+# MacOSX_X86_64
+# Android_ARMV7L_Cross
+#
+# Define multiple targets which should be build in a row with:
+# target.platforms = XXXX, YYYY
+#
+# Add Properties with:
+# target.platforms.XXXX.generator=Unix Makefiles / Visual Studio 8 2005 / XCode - See CMake
documentation for possible Generators
+# target.platforms.XXXX.buildTests=YES / NO
+#
+# If you want to use a local Capu Source Dir:
+#
+# LOCAL_CAPU_SOURCE_DIR=/Path/To/Your/Local/capu/Dir
+#
+# -----------------
+# Example:
+# -----------------
+#
+# target.platforms = Windows_X86_32, QNX_X86_32
+# target.platforms.Windows_X86_32.generator=Visual Studio 8 2005
+# target.platforms.QNX_X86_32.generator=Unix Makefiles
+# target.platforms.QNX_X86_32.buildTests=NO
+#
\ No newline at end of file

Modified: etch/trunk/binding-cpp/runtime/build.xml
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/build.xml?rev=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/build.xml (original)
+++ etch/trunk/binding-cpp/runtime/build.xml Fri Mar 21 08:52:09 2014
@@ -21,7 +21,7 @@
     <description>Etch-to-CPP runtime binding implementation</description>
     <property name="Etch.basedir" location="${basedir}/../.." />
 
-    <property file="build.properties"/>
+    <loadproperties srcFile="build.properties"/>
 
     <!-- import custom rules which can be used by depending projects to override ant targets
-->
     <import file="custom_rules.xml" optional="true" />
@@ -32,6 +32,7 @@
     <!-- Static properties of the sub-project -->
     <property name="proj"                 location="${Etch.basedir}/binding-cpp/runtime"
/>
     <property name="target"               location="${proj}/target" />
+    <property name="capu3rd"              location="${target}/3rd/capu" />
     <property name="testResultsDirectory" location="${target}/test-results" />
 
     <property name="binaryDir"            location="${Etch.dist}/binding-cpp/bin"/>
@@ -84,7 +85,17 @@
         </if>
         <for list="${target.platforms}" param="platform" delimiter="," trim="true">
             <sequential>
-                <var  name="platform" value="@{platform}"/>
+                <var name="platform" value="@{platform}"/>
+                <var name="cmake.build.etchtests" unset="true"/>
+                <if>
+                    <isset property="target.platforms.${platform}.buildTests" />
+                        <then>
+                            <propertycopy name="cmake.build.etchtests" from="target.platforms.${platform}.buildTests"
/>
+                        </then>
+                        <else>
+                            <property name="cmake.build.etchtests" value="YES" />
+                        </else>
+                </if>
                 <echo>Init platform: ${platform}</echo>
                 <antcall target="init"/>
                 <echo>Building platform: ${platform}</echo>
@@ -187,14 +198,20 @@
                     <arg value="-DCMAKE_BUILD_TYPE:STRING=${Etch.build.target}"/>
                     <arg value="-DCAPU_INCLUDE_DIR:PATH=${use.capu.include.dir}"/>
                     <arg value="-DCAPU_LIBRARY_DIR:PATH=${use.capu.library.dir}"/>
+                    <arg value="-DCAPU_BUILD_DIR:PATH=${capu3rd}" />
                     <arg value="-DLOCAL_CAPU_SOURCE_DIR:PATH=${use.capu.local.source.dir}"/>
-                    <arg value="-DCONFIG_BUILD_UNITTESTS:BOOLEAN=0"/>
+                    <arg value="-DCONFIG_BUILD_TESTS:BOOL=${cmake.build.etchtests}" />
                     <arg value="${basedir}"/>
                 </exec>
 
                 <!-- run the build -->
+                <exec dir="${target}/${platform}/${Etch.build.target}" executable="cmake"
failonerror="false">
+                    <arg line="--build . --target rebuild_cache --config ${Etch.build.target}"/>
+                </exec>
+
+                <!-- run the build -->
                 <exec dir="${target}/${platform}/${Etch.build.target}" executable="cmake"
failonerror="true">
-                    <arg line="--build . --target install --config ${Etch.build.target}
-- ${use.custom.build.options}"/>
+                    <arg line="--build . --target install --config ${Etch.build.target}"/>
                 </exec>
 
             </then>
@@ -216,7 +233,8 @@
                     <arg value="-DCAPU_INCLUDE_DIR:PATH=${use.capu.include.dir}"/>
                     <arg value="-DCAPU_LIBRARY_DIR:PATH=${use.capu.library.dir}"/>
                     <arg value="-DLOCAL_CAPU_SOURCE_DIR:PATH=${use.capu.local.source.dir}"/>
-                    <arg value="-DCONFIG_BUILD_UNITTESTS:BOOLEAN=0"/>
+                    <arg value="-DCAPU_BUILD_DIR:PATH=${capu3rd}" />
+                    <arg value="-DCONFIG_BUILD_TESTS:BOOL=${cmake.build.etchtests}" />
                     <arg value="${basedir}"/>
                 </exec>
 
@@ -240,11 +258,11 @@
     <target name="postbuild" depends="build,do-postbuild">
     </target>
   
-    <target name="do-test" unless="build.skip.tests">
+    <target name="do-test" unless="skip.tests">
         <if>
-            <isset property="target.platforms.${platform}.crosscompile"/>
+            <not><equals arg1="${cmake.build.etchtests}" arg2="YES"/></not>
             <then>
-                <echo>Not executing tests for cross compiled platform</echo>
+                <echo>Test execution has been disabled.</echo>
             </then>
             <else>
                 <!-- Run Etch Unit Tests -->

Copied: etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_32.toolchain (from r1579585,
etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain)
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_32.toolchain?p2=etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_32.toolchain&p1=etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain&r1=1579585&r2=1579900&rev=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain (original)
+++ etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_32.toolchain Fri Mar 21 08:52:09
2014
@@ -19,16 +19,24 @@ SET(CMAKE_SYSTEM_NAME MacOSX)
 SET(CMAKE_SYSTEM_VERSION 1)
 
 SET(TARGET_OS MacOSX)
-SET(TARGET_ARCH x86_64)
-# SET(TARGET_COMPILER GCC)
+SET(TARGET_ARCH X86_32)
 
-SET(CMAKE_C_FLAGS_DEBUG "-m64 -ggdb -Wall -D_DEBUG")
+SET(CMAKE_OSX_ARCHITECTURES i386)
+
+include(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
+
+SET(CMAKE_C_FLAGS_DEBUG "-m32 -arch i386 -ggdb -Wall -D_DEBUG")
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 
-SET(CMAKE_C_FLAGS_RELEASE "-m64 -Wall -O3 -DNDEBUG")
+SET(CMAKE_C_FLAGS_RELEASE "-m32 -arch i386 -Wall -O3 -DNDEBUG")
 SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
 
 add_definitions("-DTARGET_OS=MacOSX")
-add_definitions("-DTARGET_ARCH=X86_64")
-add_definitions("-DOS_MACOSX")
-add_definitions("-DARCH_X86_64")
+add_definitions("-DTARGET_ARCH=X86_32")
+add_definitions("-DOS_MacOSX")
+add_definitions("-DARCH_X86_32")
+
+#Use GTEST own tuple implementation for OSX
+ADD_DEFINITIONS ("-DGTEST_USE_OWN_TR1_TUPLE=1")

Propchange: etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_32.toolchain
------------------------------------------------------------------------------
    svn:executable = *

Modified: etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain?rev=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain (original)
+++ etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain Fri Mar 21 08:52:09
2014
@@ -19,8 +19,11 @@ SET(CMAKE_SYSTEM_NAME MacOSX)
 SET(CMAKE_SYSTEM_VERSION 1)
 
 SET(TARGET_OS MacOSX)
-SET(TARGET_ARCH x86_64)
-# SET(TARGET_COMPILER GCC)
+SET(TARGET_ARCH X86_64)
+
+include(CMakeForceCompiler)
+CMAKE_FORCE_C_COMPILER(clang clang)
+CMAKE_FORCE_CXX_COMPILER(clang++ clang)
 
 SET(CMAKE_C_FLAGS_DEBUG "-m64 -ggdb -Wall -D_DEBUG")
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
@@ -30,5 +33,8 @@ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_F
 
 add_definitions("-DTARGET_OS=MacOSX")
 add_definitions("-DTARGET_ARCH=X86_64")
-add_definitions("-DOS_MACOSX")
+add_definitions("-DOS_MacOSX")
 add_definitions("-DARCH_X86_64")
+
+#Use GTEST own tuple implementation for OSX
+ADD_DEFINITIONS ("-DGTEST_USE_OWN_TR1_TUPLE=1")

Propchange: etch/trunk/binding-cpp/runtime/toolchains/MacOSX_X86_64.toolchain
------------------------------------------------------------------------------
    svn:executable = *

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=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain (original)
+++ etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain Fri Mar 21 08:52:09
2014
@@ -23,10 +23,10 @@ SET(TARGET_ARCH X86_32)
 SET(TARGET_COMPILER MSVC)
 
 SET(CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /DNDEBUG /MP8 /GR-")
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W3")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W3 /WX")
 
 SET(CMAKE_C_FLAGS_DEBUG "/MDd /Zi /Od /RTC1 /D_DEBUG /MP8" )
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W3")
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W3 /WX")
 
 add_definitions("-DTARGET_OS=Windows")
 add_definitions("-DTARGET_ARCH=X86_32")
@@ -34,6 +34,9 @@ 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
+
+#enables CAPU builds on Windows Version >= Win Vista
+#we need this as some API calls used require this version
 add_definitions("-D_WIN32_WINNT=0x0600")
 add_definitions("-DWINVER=0x0600")
 

Propchange: etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_32.toolchain
------------------------------------------------------------------------------
    svn:executable = *

Modified: etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain?rev=1579900&r1=1579899&r2=1579900&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain (original)
+++ etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain Fri Mar 21 08:52:09
2014
@@ -22,12 +22,11 @@ SET(TARGET_OS Windows)
 SET(TARGET_ARCH X86_64)
 SET(TARGET_COMPILER MSVC)
 
-SET(CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /DNDEBUG /MP8 /GR-")
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W3")
+SET(CMAKE_C_FLAGS_RELEASE "/MD /O2 /Ob2 /DNDEBUG /MP8 /GR- ")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /W3 /WX")
 
 SET(CMAKE_C_FLAGS_DEBUG "/MDd /Zi /Od /RTC1 /D_DEBUG /MP8" )
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W3")
-
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /W3 /WX")
 
 add_definitions("-DTARGET_OS=Windows")
 add_definitions("-DTARGET_ARCH=X86_64")
@@ -36,5 +35,7 @@ add_definitions("-DARCH_X86_64")
 
 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")
+#enables CAPU builds on Windows Version >= Win Vista
+#we need this as some API calls used require this version
+add_definitions("-D_WIN32_WINNT=0x0600")
+add_definitions("-DWINVER=0x0600")

Propchange: etch/trunk/binding-cpp/runtime/toolchains/Windows_X86_64.toolchain
------------------------------------------------------------------------------
    svn:executable = *



Mime
View raw message