Skip to content
Snippets Groups Projects
Commit 1c002e7c authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Pass address size to CMake via the platform parameter (see corresponding change in our autobuild)

parent d11fee37
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 4
View file @ 1c002e7c
...@@ -20,10 +20,8 @@ indra/.distcc ...@@ -20,10 +20,8 @@ indra/.distcc
build-vc80/ build-vc80/
build-vc100/ build-vc100/
build-vc120/ build-vc120/
build-vc120-32/ build-vc[0-9]*-32/
build-vc120-64/ build-vc[0-9]*-64/
build-vc150-32/
build-vc150-64/
indra/CMakeFiles indra/CMakeFiles
indra/build-vc[0-9]* indra/build-vc[0-9]*
indra/lib/mono/1.0/*.dll indra/lib/mono/1.0/*.dll
......
autobuild.xml
+ 8
− 0
View file @ 1c002e7c
...@@ -3868,6 +3868,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -3868,6 +3868,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
<string>-A</string>
<string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
...@@ -3906,6 +3908,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -3906,6 +3908,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
<string>-A</string>
<string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
...@@ -3940,6 +3944,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -3940,6 +3944,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
<string>-A</string>
<string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -3976,6 +3982,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> ...@@ -3976,6 +3982,8 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<array> <array>
<string>-G</string> <string>-G</string>
<string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string> <string>${AUTOBUILD_WIN_CMAKE_GEN|NOTWIN}</string>
<string>-A</string>
<string>${AUTOBUILD_WIN_CMAKE_PLAT|NOTWIN}</string>
<string>-DUNATTENDED:BOOL=ON</string> <string>-DUNATTENDED:BOOL=ON</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_KDU=FALSE</string> <string>-DUSE_KDU=FALSE</string>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment