diff options
Diffstat (limited to 'indra/integration_tests')
| -rw-r--r-- | indra/integration_tests/llimage_libtest/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | indra/integration_tests/llui_libtest/CMakeLists.txt | 16 | 
2 files changed, 0 insertions, 30 deletions
| diff --git a/indra/integration_tests/llimage_libtest/CMakeLists.txt b/indra/integration_tests/llimage_libtest/CMakeLists.txt index 9ac3498d09..00da3e7efc 100644 --- a/indra/integration_tests/llimage_libtest/CMakeLists.txt +++ b/indra/integration_tests/llimage_libtest/CMakeLists.txt @@ -48,19 +48,6 @@ set_target_properties(llimage_libtest      FALSE  ) -# OS-specific libraries -if (DARWIN) -  include(CMakeFindFrameworks) -  find_library(COREFOUNDATION_LIBRARY CoreFoundation) -  set(OS_LIBRARIES ${COREFOUNDATION_LIBRARY}) -elseif (WINDOWS) -  set(OS_LIBRARIES) -elseif (LINUX) -  set(OS_LIBRARIES) -else (DARWIN) -  message(FATAL_ERROR "Unknown platform") -endif (DARWIN) -  # Libraries on which this application depends on  # Sort by high-level to low-level  target_link_libraries(llimage_libtest @@ -71,7 +58,6 @@ target_link_libraries(llimage_libtest          llimage          llkdu          llimagej2coj -        ${OS_LIBRARIES}          )  if (DARWIN) diff --git a/indra/integration_tests/llui_libtest/CMakeLists.txt b/indra/integration_tests/llui_libtest/CMakeLists.txt index baa814fb8b..ef6107fe66 100644 --- a/indra/integration_tests/llui_libtest/CMakeLists.txt +++ b/indra/integration_tests/llui_libtest/CMakeLists.txt @@ -57,21 +57,6 @@ list(APPEND llui_libtest_SOURCE_FILES ${llui_libtest_HEADER_FILES})  add_executable(llui_libtest ${llui_libtest_SOURCE_FILES}) -# Link with OS-specific libraries for LLWindow dependency -if (DARWIN) -  find_library(COCOA_LIBRARY Cocoa) -  find_library(IOKIT_LIBRARY IOKit) -  set(OS_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY}) -elseif (WINDOWS) -  #ll_stack_trace needs this now... -  list(APPEND WINDOWS_LIBRARIES dbghelp) -  set(OS_LIBRARIES ${WINDOWS_LIBRARIES}) -elseif (LINUX) -  set(OS_LIBRARIES) -else (DARWIN) -  message(FATAL_ERROR "unknown platform") -endif (DARWIN) -  # Libraries on which this library depends, needed for Linux builds  # Sort by high-level to low-level  target_link_libraries(llui_libtest @@ -83,7 +68,6 @@ target_link_libraries(llui_libtest          llimage          llkdu          llimagej2coj -        ${OS_LIBRARIES}          )  if (WINDOWS) | 
