summaryrefslogtreecommitdiff
path: root/indra/cmake/00-Common.cmake
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-08-18 14:38:46 -0400
committerOz Linden <oz@lindenlab.com>2014-08-18 14:38:46 -0400
commitd3c63401d26406093023e7cf4426ef4e29e138fd (patch)
tree3e3274e9782adbede8c0ebbd04bc2292746c526e /indra/cmake/00-Common.cmake
parent5519e8eac2c173949ed6cd67eb5ca6344dbace33 (diff)
parentb021c90e7bccdd0f9a916946e7716a00034254c2 (diff)
merge changes for 3.7.14-release
Diffstat (limited to 'indra/cmake/00-Common.cmake')
-rwxr-xr-xindra/cmake/00-Common.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 6a0f7a214c..52b0f4e8b4 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -62,7 +62,7 @@ if (WINDOWS)
add_definitions(
/DLL_WINDOWS=1
/DNOMINMAX
- /DDOM_DYNAMIC
+# /DDOM_DYNAMIC # For shared library colladadom
/DUNICODE
/D_UNICODE
/GS