aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-03-30 02:42:24 -0700
committerMcCabe Maxsted2009-03-30 02:42:24 -0700
commitedadcfadf71ac23d301a1b6fb186883d6d757ed0 (patch)
tree377f08b13ac8d0f3ba267a5cff91ebd7ae23431d
parentAdded VS optimizations to cmake (diff)
downloadmeta-impy-edadcfadf71ac23d301a1b6fb186883d6d757ed0.zip
meta-impy-edadcfadf71ac23d301a1b6fb186883d6d757ed0.tar.gz
meta-impy-edadcfadf71ac23d301a1b6fb186883d6d757ed0.tar.bz2
meta-impy-edadcfadf71ac23d301a1b6fb186883d6d757ed0.tar.xz
Added flag for multi-core compiling in VS2005
-rw-r--r--ChangeLog.txt1
-rw-r--r--linden/indra/cmake/00-Common.cmake8
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index e302c11..1ddae18 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -9,6 +9,7 @@
9 9
10 * linden/indra/cmake/00-Common.cmake 10 * linden/indra/cmake/00-Common.cmake
11 Added VS optimizations to cmake 11 Added VS optimizations to cmake
12 Added flag for multi-core compiling in VS2005
12 13
13 14
142009-03-28 Jacek Antonelli <jacek.antonelli@gmail.com> 152009-03-28 Jacek Antonelli <jacek.antonelli@gmail.com>
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 0866a32..27838d6 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -60,9 +60,17 @@ if (WINDOWS)
60 60
61 # VS optimization flags 61 # VS optimization flags
62 if(MSVC80) 62 if(MSVC80)
63
64 set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
65
63 set(CMAKE_CXX_FLAGS_RELEASE 66 set(CMAKE_CXX_FLAGS_RELEASE
64 "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT" 67 "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
65 CACHE STRING "C++ compiler release options" FORCE) 68 CACHE STRING "C++ compiler release options" FORCE)
69
70 add_definitions(
71 /MP${NUMBER_OF_CORES}
72 )
73
66 endif (MSVC80) 74 endif (MSVC80)
67 75
68 # Are we using the crummy Visual Studio KDU build workaround? 76 # Are we using the crummy Visual Studio KDU build workaround?