Commit 9c2bd87d authored by Kelvinrr's avatar Kelvinrr
Browse files

Merge branch 'cmake' of https://github.com/Kelvinrr/ISIS3 into cmake

parents d1a9f468 fb767979

isis/CMakeLists.txt

+6 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ include(InstallThirdParty) 
#===============================================================================

# Project information



execute_process(COMMAND export LD_LIBRARY_PATH="$ENV{LD_LIBRARY_PATH}:$ENV{CONDA_PREFIX}/lib")



project (USGS_ISIS)



# Short and long name of this package
@@ -60,7 +58,12 @@ message("Detected Operating System: ${osVersionString}") 
set(BUILD_SHARED_LIBS ON)



# Specify flags used

set(thirdPartyCppFlags -Wl,-rpath,$ENV{CONDA_PREFIX}/lib -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual)

set(thirdPartyCppFlags -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual)

# on linux, add the conda prefix to handle possible issues with rpaths at link time

# sometimes third parties do not set their rpaths correctly

if(LINUX)

  set(thirdPartyCppFlags -Wl,-rpath,$ENV{CONDA_PREFIX}/lib)

endif()



# Specify user options that can be passed in with the initial CMake command.

option(isis3Data       "Directory containing Isis3Data"                 OFF )