From 99285ca2822790bb95e31222addd9c2f98c8053b Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 29 Jun 2011 01:59:21 +1000
Subject: Fix the linux build of OTR and friends.  Hope I did not break
 Windows.

---
 linden/indra/CMakeLists.txt              | 10 +++++-----
 linden/indra/cmake/libgcrypt.cmake       |  2 +-
 linden/indra/cmake/libgpg-error.cmake    |  2 +-
 linden/indra/libgcrypt/CMakeLists.txt    |  7 ++++---
 linden/indra/libgpg-error/CMakeLists.txt |  1 +
 linden/indra/libotr/CMakeLists.txt       |  6 ++++++
 6 files changed, 18 insertions(+), 10 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/CMakeLists.txt b/linden/indra/CMakeLists.txt
index e3b5fa8..e3643d3 100644
--- a/linden/indra/CMakeLists.txt
+++ b/linden/indra/CMakeLists.txt
@@ -38,8 +38,8 @@ add_subdirectory(cmake)
 # [$PLOTR$]
 if (WINDOWS)
     add_subdirectory(${LIBS_OPEN_PREFIX}gpg.vs)
-    add_subdirectory(${LIBS_OPEN_PREFIX}libgcrypt)
     add_subdirectory(${LIBS_OPEN_PREFIX}libgpg-error)
+    add_subdirectory(${LIBS_OPEN_PREFIX}libgcrypt)
 endif (WINDOWS)
 
 # if ON will cause linux to link in static OTR like windows does
@@ -64,10 +64,6 @@ add_subdirectory(${LIBS_OPEN_PREFIX}llvfs)
 add_subdirectory(${LIBS_OPEN_PREFIX}llwindow)
 add_subdirectory(${LIBS_OPEN_PREFIX}llxml)
 
-# [$PLOTR$]
-add_subdirectory(${LIBS_OPEN_PREFIX}libotr)
-# [/$PLOTR$]
-
 add_subdirectory(${LIBS_OPEN_PREFIX}lscript)
 
 if (WINDOWS AND EXISTS ${LIBS_CLOSED_DIR}copy_win_scripts)
@@ -109,6 +105,10 @@ if (VIEWER)
     add_dependencies(viewer solaris-crash-logger)
   endif (LINUX)
 
+# [$PLOTR$]
+    add_subdirectory(${LIBS_OPEN_PREFIX}libotr)
+# [/$PLOTR$]
+
   add_subdirectory(${VIEWER_PREFIX}newview)
   add_dependencies(viewer meta-impy-bin)
 endif (VIEWER)
diff --git a/linden/indra/cmake/libgcrypt.cmake b/linden/indra/cmake/libgcrypt.cmake
index 6ac93b9..057addf 100644
--- a/linden/indra/cmake/libgcrypt.cmake
+++ b/linden/indra/cmake/libgcrypt.cmake
@@ -5,6 +5,6 @@ set(LIBGCRYPT_INCLUDE_DIRS
     )
 
 set(LIBGCRYPT_LIBRARIES
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libgcrypt/libgcrypt-1.2.2/lib
+    gcrypt
     )
 
diff --git a/linden/indra/cmake/libgpg-error.cmake b/linden/indra/cmake/libgpg-error.cmake
index e2df9f7..b83adee 100644
--- a/linden/indra/cmake/libgpg-error.cmake
+++ b/linden/indra/cmake/libgpg-error.cmake
@@ -5,6 +5,6 @@ set(LIBGPG-ERROR_INCLUDE_DIRS
     )
 
 set(LIBGPG-ERROR_LIBRARIES
-    ${CMAKE_CURRENT_SOURCE_DIR}/../libgpg-error/libgpg-error-1.0/lib
+    gpg-error
     )
 
diff --git a/linden/indra/libgcrypt/CMakeLists.txt b/linden/indra/libgcrypt/CMakeLists.txt
index 31c547f..1b6794c 100644
--- a/linden/indra/libgcrypt/CMakeLists.txt
+++ b/linden/indra/libgcrypt/CMakeLists.txt
@@ -144,9 +144,10 @@ include_directories(${LIBGCRYPT_INCLUDE_DIRS})
 
 add_library(libgcrypt STATIC IMPORTED)
 
-set_target_properties(libgcrypt PROPERTIES 
-    IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../libgcrypt/libgcrypt-1.2.2/lib/libgcrypt.a
-    )
+# Happy this is not needed, but leaving it around for reference.
+#set_target_properties(libgcrypt PROPERTIES 
+#    IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../libgcrypt/libgcrypt-1.2.2/lib/libgcrypt.a
+#    )
 
 # This wont work until 2.8.4  sigh
 #add_dependencies(libgcrypt EP_libgcrypt)
diff --git a/linden/indra/libgpg-error/CMakeLists.txt b/linden/indra/libgpg-error/CMakeLists.txt
index a595ab8..b3db72e 100644
--- a/linden/indra/libgpg-error/CMakeLists.txt
+++ b/linden/indra/libgpg-error/CMakeLists.txt
@@ -66,6 +66,7 @@ include_directories(${LIBGPG-ERROR_INCLUDE_DIRS})
 
 add_library(libgpg-error STATIC IMPORTED)
 
+# Happy this is not needed, but leaving it around for reference.
 #set_target_properties(libgpg-error PROPERTIES 
 #    IMPORTED_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../libgpg-error/libgpg-error-1.0/lib/libgpg-error.a
 #    )
diff --git a/linden/indra/libotr/CMakeLists.txt b/linden/indra/libotr/CMakeLists.txt
index b9da8f1..f0561d8 100644
--- a/linden/indra/libotr/CMakeLists.txt
+++ b/linden/indra/libotr/CMakeLists.txt
@@ -63,3 +63,9 @@ target_link_libraries(libotr
     gcrypt
     gpg-error
     )
+
+# 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)
+
-- 
cgit v1.1