2 files changed, 9 insertions, 4 deletions

diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt
index e3643d3..de5dee8 100644
--- a/linden/indra/CMakeLists.txt
+++ b/linden/indra/CMakeLists.txt
@@ -46,8 +46,10 @@ endif (WINDOWS)
 # if off will use the systems libotr.so but won't be fully compatible with windows version
 set(STATIC_LIBOTR_ETC 1)
 
-add_subdirectory(${LIBS_OPEN_PREFIX}libgpg-error)
-add_subdirectory(${LIBS_OPEN_PREFIX}libgcrypt)
+if (NOT WINDOWS)
+    add_subdirectory(${LIBS_OPEN_PREFIX}libgpg-error)
+    add_subdirectory(${LIBS_OPEN_PREFIX}libgcrypt)
+endif (NOT WINDOWS)
 # [/$PLOTR$]
 
 add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
diff --git a/linden/indra/libotr/CMakeLists.txt b/linden/indra/libotr/CMakeLists.txt
index f0561d8..282535f 100644
--- a/linden/indra/libotr/CMakeLists.txt
+++ b/linden/indra/libotr/CMakeLists.txt
@@ -66,6 +66,9 @@ target_link_libraries(libotr
 
 # Not sure if either or both are needed, does not seem to hurt.
 # Still does not make things build in the right sequence.  sigh
-add_dependencies(libotr EP_libgcrpt)
-add_dependencies(libotr libgcrypt)
+if (NOT WINDOWS)
+    add_dependencies(libotr EP_libgcrpt)
+else (NOT WINDOWS)
+    add_dependencies(libotr libgcrypt)
+endif (NOT WINDOWS)