Fix up gcrypt and gpg-error compiling and linking. Much cleaner now,and Windows might work again.

3 files changed, 5 insertions, 5 deletions

diff --git a/linden/indra/cmake/libgcrypt.cmake b/linden/indra/cmake/libgcrypt.cmake
index 057addf..4d19467 100644
--- a/linden/indra/cmake/libgcrypt.cmake
+++ b/linden/indra/cmake/libgcrypt.cmake
@@ -1,10 +1,10 @@
 # -*- cmake -*-
 
 set(LIBGCRYPT_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libgcrypt/libgcrypt-1.2.2/include
+    ${CMAKE_BINARY_DIR}/libgcrypt/include
     )
 
 set(LIBGCRYPT_LIBRARIES
-    gcrypt
+    ${CMAKE_BINARY_DIR}/libgcrypt/lib/libgcrypt.a
     )
 
diff --git a/linden/indra/cmake/libgpg-error.cmake b/linden/indra/cmake/libgpg-error.cmake
index b83adee..417ad19 100644
--- a/linden/indra/cmake/libgpg-error.cmake
+++ b/linden/indra/cmake/libgpg-error.cmake
@@ -1,10 +1,10 @@
 # -*- cmake -*-
 
 set(LIBGPG-ERROR_INCLUDE_DIRS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libgpg-error/libgpg-error-1.0/include
+    ${CMAKE_BINARY_DIR}/libgpg-error/include
     )
 
 set(LIBGPG-ERROR_LIBRARIES
-    gpg-error
+    ${CMAKE_BINARY_DIR}/libgpg-error/lib/libgpg-error.a
     )
 
diff --git a/linden/indra/cmake/libotr.cmake b/linden/indra/cmake/libotr.cmake
index 3c07be2..30544f8 100644
--- a/linden/indra/cmake/libotr.cmake
+++ b/linden/indra/cmake/libotr.cmake
@@ -4,5 +4,5 @@ set(LIBOTR_INCLUDE_DIRS
     )
 
 set(LIBOTR_LIBRARIES
-    libotr
+    otr
     )