Commit 2cdfb263 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Merge branch 'cmake' of github.com:usgs-astrogeology/isis3 into cmake

parents b8f566b5 b87dec7c

environment.yml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ dependencies: 
  - bzip2==1.0.6=1

  - cmake==3.9.1=0

  - cspice==66-0

  - curl==7.55.1=0

  - curl==7.60.0=0

  - doxygen==1.8.14=0

  - eigen==3.3.3=0

  - embree==2.14.0=0

isis/CMakeLists.txt

+6 −3
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ set(thirdPartyCppFlags -Wall 
                       -DISIS_LITTLE_ENDIAN=1

                       -Wno-unused-parameter

                       -Wno-overloaded-virtual

                       -Wno-strict-aliasing

                       -DGMM_USES_SUPERLU

                       -DENABLEJP2K=${JP2KFLAG}

                     )
@@ -209,7 +210,9 @@ find_package(Qt5 COMPONENTS 
                WebChannel

                Widgets

                Xml

                XmlPatterns REQUIRED)

                XmlPatterns

                # Search this path explicitly for MacOS OpenGL Framework

                PATHS /System/Library/Frameworks/ REQUIRED)



# Some of these will have non-traditional installs with version numbers in the paths in v007

# For these, we pass in a version number, and use it in the path suffix

isis/make/config.darwin-MacOSX10_13

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ ISIS3PROP ?= $(IDK_ROOT)/proprietary 
#  Set up paths to needed for doxygen

DOXYGEN     = $(ISIS3OPT)/bin/doxygen

DOT_PATH    = $(ISIS3OPT)/bin

GREP        = /usr/local/bin/ggrep

GREP        = /usr/local/bin/grep



# Set up path for OS specific locations of 3rd party licenses

THIRDPARTYLICPATH := /opt/usgs/$(ISISLOCALVERSION)/3rdParty/license/

isis/src/dev/Makefile

0 → 100644
+2 −0
Original line number Diff line number Diff line 
include $(ISISROOT)/make/isismake.cat

isis/src/dev/README.md

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# Please Note:



The applications in this directory are meant only to be used for camera 

development. They are not guaranteed to be stable and are not supported for

general public use. Use at your own risk!