Commit 9778b4e3 authored by Summer Stapleton's avatar Summer Stapleton
Browse files

Merging upstream cmake branch

parents 7d645b2c 03597eb4

isis/CMakeLists.txt

+5 −3
Original line number Diff line number Diff line
@@ -210,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/