Merge branch 'conda' of https://github.com/Kelvinrr/isis3_cmake into conda (5f976901) · Commits · aflab / astrogeology / ISIS3

isis/cmake/FindBoost.cmake

+0 −4

Original line number	Diff line number	Diff line
		@@ -129,10 +129,6 @@ find_library(BOOST_WAVE_MT_LIBRARY
		NAMES boost_wave-mt boost_wave
		)

		#tjw: not being linked against by ISIS presently
		#find_library(BOOST_LOCAL_MT_LIBRARY
		# NAMES boost_locale-mt boost_locale
		#)
		find_library(BOOST_RANDOM_MT_LIBRARY
		NAMES boost_random-mt boost_random
		)

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,5 +44,5 @@ message( "-- FORTRAN LIB: " ${FORTRAN_LIBRARY} )
		message( "-- BLAS LIB: " ${BLAS_LIBRARY} )

		if(NOT APPLE)
		message("LAPACK LIB" ${LAPACK_LIBRARY})
		message("-- LAPACK LIB: " ${LAPACK_LIBRARY})
		endif()

+0 −13

Original line number	Diff line number	Diff line
		@@ -5,21 +5,10 @@
		# Library portion of the installation
		function(install_third_party_libs)



		# Where all the library files will go
		set(installLibFolder "${CMAKE_INSTALL_PREFIX}/3rdParty/lib")
		execute_process(COMMAND mkdir -p ${installLibFolder})

		# TEMPORARY CODE TO INSTALL ALL FILES FROM V007/lib into 3rdParty/lib
		if(APPLE)
		install(DIRECTORY "/opt/usgs/v007/3rdParty/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})
		install(DIRECTORY "/opt/usgs/v007/ports/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})
		install(DIRECTORY "/opt/usgs/v007/proprietary/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})
		else()
		install(DIRECTORY "/usgs/pkgs/local/v007/lib" DESTINATION ${CMAKE_INSTALL_PREFIX})
		endif()

		# Loop through all the library files in our list
		foreach(library ${ALLLIBS})
		get_filename_component(extension ${library} EXT)
		@@ -43,8 +32,6 @@ function(install_third_party_libs)
		endif(APPLE)
		endfunction()



		# Plugin portion of the installation
		function(install_third_party_plugins)

+17 −17

File changed.

Contains only whitespace changes.