Commit ad639988 authored by Kelvin Rodriguez's avatar Kelvin Rodriguez
Browse files

fixed rpath issues for conda

parent 02a9b760

isis/CMakeLists.txt

+4 −4
Original line number Diff line number Diff line
@@ -150,11 +150,11 @@ set(CORE_LIB_NAME isis3) 
# Specify relative library include paths which will be set up on

#  the installed files.

if(APPLE)

  set(CMAKE_INSTALL_RPATH "@loader_path/../lib;@loader_path/../3rdParty/lib")

  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};@loader_path/../lib;@loader_path/../3rdParty/lib")

else()

  set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib;$ORIGIN/../3rdParty/lib")

  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};$ORIGIN/../lib;$ORIGIN/../3rdParty/lib")

endif()

set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)

set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)



# We will set up some links with these files at the end of the install process so

#  make sure they are cleared at the start of the install process.

isis/cmake/AddIsisModule.cmake

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ function(add_isis_app folder libDependencies) 
endfunction(add_isis_app)









# Set up the lone unit test in an obj folder

function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs)

isis/cmake/FindAllDependencies.cmake

+0 −2
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ find_program(RCC rcc REQUIRED) 
find_program(PROTOC protoc REQUIRED)



if(APPLE)

  find_package(OpenGL            REQUIRED)

  find_package(Qt5 COMPONENTS

                  Core

                  Concurrent
@@ -231,4 +230,3 @@ endforeach() 
list(REMOVE_DUPLICATES ALLLIBDIRS)

list(REMOVE_DUPLICATES ALLLIBS)

list(REMOVE_DUPLICATES ALLINCDIRS)

isis/cmake/FindOpenGL.cmake

+4 −4
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ find_library(GL_LIBRARY 
find_library(GLU_LIBRARY

  NAMES GLU

)

message("==================")

message(${OPENGL_INCLUDE_DIR})

message(${GL_LIBRARY})

message(${GLU_LIBRARY})



message( "-- OPENGL INCLUDE DIR: ${OPENGL_INCLUDE_DIR}")

message( "-- OPENGL LIB: ${GL_LIBRARY}")

message( "-- OPENGLU LIB: ${GLU_LIBRARY}")



get_filename_component(OPENGL_INCLUDE_DIR "${OPENGL_INCLUDE_DIR}" DIRECTORY)

isis/cmake/InstallThirdParty.cmake

+0 −6
Original line number Diff line number Diff line
@@ -25,11 +25,6 @@ function(install_third_party_libs) 
      execute_process(COMMAND cp -L ${library} ${installLibFolder})

    endif()

  endforeach()



  # Copy over QT Frameworks

  if(APPLE)

    # execute_process(COMMAND cp -Lr ${library} ${installLibFolder})

  endif(APPLE)

endfunction()



# Plugin portion of the installation
@@ -59,7 +54,6 @@ function(install_third_party_license) 
    install(CODE "execute_process(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/3rdParty/)")

  endif()

  install(CODE "execute_process(COMMAND cp -r ${LIC_DIR} ${CMAKE_INSTALL_PREFIX}/3rdParty/license)")



endfunction()