Skip to content
Snippets Groups Projects
Commit 8f0d59ca authored by Oz Linden's avatar Oz Linden
Browse files

OPEN-50 (partial): refactor cmake switches to common configurations and default values

parent 8d452969
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
autobuild.xml
+ 9
− 60
View file @ 8f0d59ca
...@@ -1590,7 +1590,6 @@ ...@@ -1590,7 +1590,6 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=Debug</string> <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
<string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string> <string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
</array> </array>
...@@ -1607,9 +1606,11 @@ ...@@ -1607,9 +1606,11 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=Debug</string> <string>-DCMAKE_BUILD_TYPE:STRING=Debug</string>
<string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string> <string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_PRECOMPILED_HEADERS=ON</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1627,7 +1628,6 @@ ...@@ -1627,7 +1628,6 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
<string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string> <string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
</array> </array>
...@@ -1644,9 +1644,11 @@ ...@@ -1644,9 +1644,11 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string> <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
<string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string> <string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_PRECOMPILED_HEADERS=ON</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1664,7 +1666,6 @@ ...@@ -1664,7 +1666,6 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string> <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
<string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string> <string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
</array> </array>
...@@ -1681,9 +1682,11 @@ ...@@ -1681,9 +1682,11 @@
<key>options</key> <key>options</key>
<array> <array>
<string>-DCMAKE_BUILD_TYPE:STRING=Release</string> <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
<string>-DUNATTENDED:BOOL=OFF</string>
<string>-DWORD_SIZE:STRING=32</string> <string>-DWORD_SIZE:STRING=32</string>
<string>-DROOT_PROJECT_NAME:STRING=SecondLife</string> <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DUSE_PRECOMPILED_HEADERS=ON</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1728,9 +1731,6 @@ ...@@ -1728,9 +1731,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Xcode'</string> <string>'Xcode'</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1758,9 +1758,6 @@ ...@@ -1758,9 +1758,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Xcode'</string> <string>'Xcode'</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1795,9 +1792,6 @@ ...@@ -1795,9 +1792,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Xcode'</string> <string>'Xcode'</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
...@@ -1827,9 +1821,6 @@ ...@@ -1827,9 +1821,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Xcode'</string> <string>'Xcode'</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1864,9 +1855,6 @@ ...@@ -1864,9 +1855,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Xcode'</string> <string>'Xcode'</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1894,9 +1882,6 @@ ...@@ -1894,9 +1882,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Xcode'</string> <string>'Xcode'</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1933,9 +1918,6 @@ ...@@ -1933,9 +1918,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1962,9 +1944,6 @@ ...@@ -1962,9 +1944,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -1991,9 +1970,6 @@ ...@@ -1991,9 +1970,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
...@@ -2022,9 +1998,6 @@ ...@@ -2022,9 +1998,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2051,9 +2024,6 @@ ...@@ -2051,9 +2024,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2080,9 +2050,6 @@ ...@@ -2080,9 +2050,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>'Unix Makefiles'</string> <string>'Unix Makefiles'</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2140,9 +2107,6 @@ ...@@ -2140,9 +2107,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2182,9 +2146,6 @@ ...@@ -2182,9 +2146,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2224,9 +2185,6 @@ ...@@ -2224,9 +2185,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
...@@ -2260,9 +2218,6 @@ ...@@ -2260,9 +2218,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2303,9 +2258,6 @@ ...@@ -2303,9 +2258,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=OFF</string>
<string>-DINSTALL_PROPRIETARY=TRUE</string>
<string>-DFMOD=TRUE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -2337,9 +2289,6 @@ ...@@ -2337,9 +2289,6 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 10"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
......
indra/cmake/Variables.cmake
+ 1
− 0
View file @ 8f0d59ca
...@@ -135,6 +135,7 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for ...@@ -135,6 +135,7 @@ set(VIEWER_LOGIN_CHANNEL ${VIEWER_CHANNEL} CACHE STRING "Fake login channel for
set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside") set(VERSION_BUILD "0" CACHE STRING "Revision number passed in from the outside")
set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.")
set(UNATTENDED OFF CACHE BOOL "Should be set to ON for building with VC Express editions.")
if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics)
set(SERVER ON CACHE BOOL "Build Second Life server software.") set(SERVER ON CACHE BOOL "Build Second Life server software.")
......
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