Back out last commit, because it breaks mapserver build on linux, dammit.

6 files changed, 9 insertions, 40 deletions

diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index c0efa27f6e..e749055abf 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -40,4 +40,9 @@ else (SERVER AND LINUX)
   set(LLWINDOW_LIBRARIES
       llwindow
       )
+  if (WINDOWS)
+      list(APPEND LLWINDOW_LIBRARIES
+          comdlg32
+          )
+  endif (WINDOWS)
 endif (SERVER AND LINUX)
diff --git a/indra/llimage/CMakeLists.txt b/indra/llimage/CMakeLists.txt
index a155d19407..1a4d92bc34 100644
--- a/indra/llimage/CMakeLists.txt
+++ b/indra/llimage/CMakeLists.txt
@@ -49,11 +49,8 @@ set_source_files_properties(${llimage_HEADER_FILES}
 list(APPEND llimage_SOURCE_FILES ${llimage_HEADER_FILES})
 
 add_library (llimage ${llimage_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries(llimage
-    llcommon
-    llimagej2coj        # *HACK: In theory a noop for KDU builds?
+target_link_libraries(
+    llimage
     ${JPEG_LIBRARIES}
     ${PNG_LIBRARIES}
     ${ZLIB_LIBRARIES}
diff --git a/indra/llrender/CMakeLists.txt b/indra/llrender/CMakeLists.txt
index 0bb835970f..0bdb55f9d0 100644
--- a/indra/llrender/CMakeLists.txt
+++ b/indra/llrender/CMakeLists.txt
@@ -3,7 +3,6 @@
 project(llrender)
 
 include(00-Common)
-include(FindOpenGL)
 include(FreeType)
 include(LLCommon)
 include(LLImage)
@@ -90,9 +89,3 @@ else (SERVER AND NOT WINDOWS AND NOT DARWIN)
       )
 endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
 add_library (llrender ${llrender_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries(llrender 
-    llimage 
-    ${FREETYPE_LIBRARIES}
-    ${OPENGL_LIBRARIES})
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 5de8dc76af..32118e8a69 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -141,14 +141,3 @@ set_source_files_properties(${llui_HEADER_FILES}
 list(APPEND llui_SOURCE_FILES ${llui_HEADER_FILES})
 
 add_library (llui ${llui_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries(llui
-    llrender
-    llwindow
-    llimage
-    llvfs       # ugh, just for LLDir
-    llxml
-    llcommon    # must be after llimage, llwindow, llrender
-    llmath
-    )
diff --git a/indra/llwindow/CMakeLists.txt b/indra/llwindow/CMakeLists.txt
index 1ffa4fe3c1..afce0c06c3 100644
--- a/indra/llwindow/CMakeLists.txt
+++ b/indra/llwindow/CMakeLists.txt
@@ -55,13 +55,6 @@ set(viewer_HEADER_FILES
     llmousehandler.h
     )
 
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-set(llwindow_LINK_LIBRARIES
-    ${UI_LIBRARIES}     # for GTK
-    ${SDL_LIBRARY}
-    )
-
 if (DARWIN)
   list(APPEND llwindow_SOURCE_FILES
     llkeyboardmacosx.cpp
@@ -105,9 +98,6 @@ if (WINDOWS)
        lldxhardware.h
        llkeyboardwin32.h
        )
-  list(APPEND llwindow_LINK_LIBRARIES
-       comdlg32     # Common Dialogs for ChooseColor
-       )
 endif (WINDOWS)
 
 if (SOLARIS)
@@ -143,7 +133,6 @@ if (SERVER AND NOT WINDOWS AND NOT DARWIN)
     ${llwindow_SOURCE_FILES}
     ${server_SOURCE_FILES}
     )
-  target_link_libraries (llwindowheadless ${llwindow_LINK_LIBRARIES})
 endif (SERVER AND NOT WINDOWS AND NOT DARWIN)
 
 if (llwindow_HEADER_FILES)
@@ -156,6 +145,4 @@ if (VIEWER)
     ${llwindow_SOURCE_FILES}
     ${viewer_SOURCE_FILES}
     )
-  target_link_libraries (llwindow ${llwindow_LINK_LIBRARIES})
 endif (VIEWER)
-
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index dc7787beea..487c5b9a8a 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -35,10 +35,8 @@ set_source_files_properties(${llxml_HEADER_FILES}
 list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES})
 
 add_library (llxml ${llxml_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries( llxml
-    llmath
+target_link_libraries(
+    llxml
     ${BOOST_SIGNALS_LIBRARY}
     ${EXPAT_LIBRARIES}
     )