Commit 26803378 authored by Oxez's avatar Oxez
Browse files

Moved libs in build dir to 3rdParty

parent 1b7a66aa

isis/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -231,9 +231,9 @@ install_third_party() 
# TIP: Set "export QT_DEBUG_PLUGINS=1" to help debug plugin errors.

foreach(plugin ${THIRDPARTYPLUGINFOLDERS})

  get_filename_component(pluginName ${plugin} NAME)

  if(NOT EXISTS ${CMAKE_BINARY_DIR}/lib/${pluginName})

  if(NOT EXISTS ${CMAKE_BINARY_DIR}/3rdParty/plugins/${pluginName})

    execute_process(COMMAND ln -s "${plugin}" ${pluginName}

    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib")

    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/3rdParty/plugins")

  endif()

endforeach()

isis/cmake/Utilities.cmake

+2 −2
Original line number Diff line number Diff line
@@ -228,8 +228,8 @@ function(add_library_wrapper name sourceFiles libDependencies) 
  #  the library should be build both shared and static.

  set(alsoStatic ${ARGN})



  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/3rdParty/lib)

  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/3rdParty/lib)



  # Add library, set dependencies, and add to installation list.

  add_library(${name} SHARED ${sourceFiles})