Some CMake Cleanup

Clean up leftover SERVER and VIEWER from when they were a single tree Fixed debian multiarch cmake Small bits of OSX cleanup
2013-03-04 03:31:24 -05:00
parent c9ab38d449
commit 43c0c4ce91
15 changed files with 214 additions and 274 deletions
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -36,17 +36,12 @@ set(LLWINDOW_INCLUDE_DIRS
    ${LIBS_OPEN_DIR}/llwindow
    )

-if (SERVER AND LINUX)
-  set(LLWINDOW_LIBRARIES
-      llwindowheadless
-      )
-else (SERVER AND LINUX)
-  set(LLWINDOW_LIBRARIES
-      llwindow
-      )
-  if (WINDOWS)
-      list(APPEND LLWINDOW_LIBRARIES
-          comdlg32
-          )
-  endif (WINDOWS)
-endif (SERVER AND LINUX)
+set(LLWINDOW_LIBRARIES
+    llwindow
+    )
+
+if (WINDOWS)
+    list(APPEND LLWINDOW_LIBRARIES
+        comdlg32
+        )
+endif (WINDOWS)