Unverified Commit 3c813321 authored by jlaura's avatar jlaura Committed by GitHub
Browse files

Merge pull request #132 from Kelvinrr/cmake 

Fixed bug on install, working environment.yml
parents ae6ae322 ae1d5aa0

environment.yml

+13 −69
Original line number Diff line number Diff line
@@ -8,119 +8,63 @@ channels: 
  - jlaura

  - defaults

dependencies:

  - ca-certificates==2017.08.26

  - dbus==1.10.20=0

  - future==0.16.0

  - gst-plugins-base

  - gstreamer==1.8.0=0

  - jsoncpp==1.8.3

  - libgfortran==3.0=0

  - libstdcxx-ng==7.2.0

  - libgfortran==3.0

  - qwt=6.1.3

  - pyqt=5.6.0

  - sip=4.18

  - libxcb==1.12=1

  - pyqt==5.6.0

  - sip==4.18

  - mysql==5.7.20

  - ncurses==5.9=10

  - ninja==1.7.2=0

  - patchelf==0.9

  - pip==9.0.1

  - setuptools=38.5.1

  - wheel==0.30.0

  - xerces-c==3.1.4=0

  - xz==5.2.3=0

  - zlib==1.2.11=0

  - blas==1.1=openblas

  - boost==1.65.1

  - boost-cpp==1.65.1

  - bzip2==1.0.6=1

  - cairo==1.14.6=4

  - certifi==2018.1.18

  - cmake==3.9.1=0

  - cspice==66-0

  - curl==7.55.1=0

  - doxygen==1.8.14=0

  - eigen==3.3.3=0

  - embree==2.14.0=0

  - expat==2.2.5=0

  - ffmpeg==3.2.4=3

  - flann==1.8.4=0

  - fontconfig==2.12.1=4

  - freeglut==3.0.0=4

  - freetype==2.7=1

  - geos==3.5.1=1

  - geotiff==1.4.2

  - gettext==0.19.8.1=0

  - giflib==5.1.4=0

  - glib==2.51.4=0

  - geotiff==1.4.2=1

  - gmp==6.1.2=0

  - gsl==2.2.1=blas_openblas_3

  - harfbuzz==1.3.4=2

  - hdf5==1.8.18=2

  - icu==58.2

  - jasper==1.900.1=1

  - jbig==2.1=0

  - icu==58.2=0

  - jpeg==9b=2

  - krb5==1.14.2=0

  - lapack==3.6.1=1

  - libffi==3.2.1=3

  - libiconv==1.15=0

  - libpng==1.6.28=2

  - libssh2==1.8.0=2

  - libtiff==4.0.9=0

  - libuv==1.11.0=0

  - libwebp==0.5.2=7

  - libxml2==2.9.7=0

  - llvm-meta==5.0.0=0

  - llvmdev==5.0.0=default_1

  - m4==1.4.17=1

  - mesalib==17.2.0=0

  - metis==5.1.0=3

  - mpc==1.0.3=4

  - mpfr==3.1.5=0

  - mysql-connector-c==6.1.6=0

  - nanoflann==1.2.2=0

  - nn==1.86.0=2

  - numpy==1.13.3=py36_blas_openblas_200

  - openblas==0.2.19=2

  - opencv==3.2.0=np113py36_blas_openblas_203

  - opencv==3.3.0

  - nanoflann==1.22

  - gmm==5.0

  - jama==125

  - openssl==1.0.2n=0

  - pcre==8.39=0

  - pixman==0.34.0=1

  - proj4==4.9.3=5

  - pthread-stubs==0.3=1

  - python==3.6

  - readline==6.2=0

  - rhash==1.3.4=0

  - six==1.11.0

  - sqlite==3.13.0=1

  - suitesparse==4.5.4=blas_openblas_200

  - superlu==5.2.1=blas_openblas_201

  - tbb==4.4_20160526=1

  - tk==8.5.19=2

  - vtk==8.1.0

  - x264==20131217=3

  - xorg-kbproto==1.0.7=1

  - xorg-libx11==1.6.4=6

  - xorg-libxau==1.0.8=3

  - xorg-libxdmcp==1.1.2=3

  - xorg-libxrender==0.9.10=0

  - xorg-renderproto==0.11.1=1

  - xorg-xproto==7.0.31=6

  - bz2file==0.98

  - cloog==0.18.0=0

  - isl==0.12.2=0

  - protobuf==3.5.1

  - system==5.8=2

  - libprotobuf==3.2.0=0

  - bullet==2.86.1=0

  - ds9==7.5=0

  - gmm==5.0=0

  - jama==125=0

  - pcl==1.8.1=0

  - pcl==1.8.1

  - qhull==7.2.0=0

  - qt==5.6.2

  - qwt==6.1.3

  - qt=5.6.2

  - qwt

  - tnt==126=0

  - xalan-c==1.11=0

  - xalan-c==1.11

prefix: /scratch/anaconda3/envs/isis

isis/CMakeLists.txt

+21 −3
Original line number Diff line number Diff line
@@ -128,6 +128,10 @@ message("\tINSTALL PREFIX: ${CMAKE_INSTALL_PREFIX}") 
#===============================================================================

#===============================================================================



# Set up the ctest tool which is used to run all of the tests.

enable_testing()

include(CTest)



# Set up Anaconda prefix in the case with a non-default conda env is activated

if(EXISTS $ENV{CONDA_PREFIX})

  message("CONDA PREFIX: $ENV{CONDA_PREFIX}")
@@ -158,6 +162,11 @@ set(thirdPartyCppFlags -Wall 
                       -DENABLEJP2K=${JP2KFLAG}

                     )



 # Append CPP flags set in the third party lib file to the string set in this file.

 string(REPLACE ";" " " FLAGS_STR "${thirdPartyCppFlags}")

 set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${FLAGS_STR}" )





# Flag to fix numeric literals problem with boost on linux

if(NOT APPLE)

  set(thirdPartyCppFlags ${thirdPartyCppFlags} -fext-numeric-literals
@@ -311,6 +320,12 @@ if(pybindings) 
 string(STRIP ${PYQT_SIP_FLAGS} PYQT_SIP_FLAGS)

 string(REPLACE " " ";" PYQT_SIP_FLAGS ${PYQT_SIP_FLAGS})

 message("Generating C++ code from sip files")



 message(STATUS "SIP BUILD FILE: ${SIP_BUILD_FILE}")

 message(STATUS "SIP MODULE: ${ISIS_SIP_MODULE}")

 message(STATUS "SIP GENERATED CODE DIR: ${ISIS_SIP_CODE_DIR}")





 execute_process(COMMAND ${SIP_BINARY_PATH} -e -o -c ${ISIS_SIP_CODE_DIR} -I ${SIP_DEFAULT_SIP_DIR}/PyQt5 ${PYQT_SIP_FLAGS} ${ISIS_SIP_MODULE})



 # add target so users can run the command after initial configuration
@@ -392,8 +407,11 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX}) 
# Have CMake process all of the source code and tests.

add_subdirectory(src objects)



# Set up third party libraries for installation

# install_third_party()

if(APPLE)

 set(SO ".dylib")

else()

 set(SO ".so")

endif()



# Set up documentation build target.

# - This script is called by running "make docs".

isis/cmake/CMakeLists.txt

+0 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ install(CODE "EXECUTE_PROCESS(COMMAND ln -sf libisis3${SO} ${CMAKE_INSTALL_PREFI 
# On OSX, need to correct all the paths encoded in each of the distributed library files so

#  that they properly find the distruted files using relative paths.

if (APPLE)

  # Call the correction script on each folder containing libraries

  install(CODE "EXECUTE_PROCESS(COMMAND python ${CMAKE_SOURCE_DIR}/scripts/finalizeInstalledOsxRpaths.py ${CMAKE_INSTALL_PREFIX}/lib)")

  install(CODE "EXECUTE_PROCESS(COMMAND python ${CMAKE_SOURCE_DIR}/scripts/finalizeInstalledOsxRpaths.py ${CMAKE_INSTALL_PREFIX}/3rdParty/lib resetRpath)")

  install(CODE "EXECUTE_PROCESS(COMMAND python ${CMAKE_SOURCE_DIR}/scripts/finalizeInstalledOsxRpaths.py ${CMAKE_INSTALL_PREFIX}/bin)")



  # Also need to get the plugin folders

  get_subdirectory_list(${CMAKE_SOURCE_DIR}/3rdParty/plugins pluginFolders)

  foreach(f ${pluginFolders})

isis/cmake/FindCholmod.cmake

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ endif() 
# if(APPLE)

  find_library(FORTRAN_LIBRARY      NAMES gfortran

    NAMES gfortran

    PATHS /opt/usgs/v007/ports/lib/gcc5/

  )



  find_library(BLAS_LIBRARY NAMES blas)