Merge pull request #16 from Kelvinrr/master (57654dec) · Commits · aflab / astrogeology / ISIS3

isis/CMakeLists.txt

+19 −25

Original line number	Diff line number	Diff line
		@@ -45,6 +45,8 @@ set(CMAKE_PREFIX_PATH
		/usr/local/lib/
		)

		set(CMAKE_FIND_FRAMEWORK LAST)

		include(AddIsisModule)
		include(Utilities)
		include(TestSetup)
		@@ -91,7 +93,6 @@ message("Detected Operating System: ${osVersionString}")
		# as a static library using some specialized code in Utilities.cmake.
		set(BUILD_SHARED_LIBS ON)


		# Specify flags used
		set(thirdPartyCppFlags -Wall -std=c++11 -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual)
		#set(thirdPartyCppFlags -Wall -ansi -DISIS_LITTLE_ENDIAN=1 -fPIC -Wno-unused-parameter -Wno-overloaded-virtual)
		@@ -104,7 +105,7 @@ option(buildCore "Build the core ISIS modules" ON )
		option(buildMissions "Build the mission specific modules" ON )
		option(buildStaticCore "Build libisis3 static as well as dynamic" OFF )
		option(buildTests "Set up unit, application, and module tests." ON )

		option(JP2KFLAG "Whether or not to build using JPEG200 support" OFF )

		if(EXISTS ${isis3Data})
		set(ENV{ISIS3DATA} "${isis3Data}")
		@@ -155,19 +156,17 @@ include(FindAllDependencies)
		include_directories(SYSTEM ${ALLINCDIRS})
		link_directories(${ALLLIBDIRS})

		# add isis headers

		# inject ISISROOT
		add_definitions( -DISISROOT="${CMAKE_SOURCE_DIR}" )
		add_definitions( -DISISBUILDDIR="${CMAKE_BINARY_DIR}" )

		# add isis headers
		file(GLOB ISIS_HEADERS ${CMAKE_SOURCE_DIR}/src//objs//*.h
		${CMAKE_SOURCE_DIR}/src//objs//*.hpp)
		file(COPY ${ISIS_HEADERS} DESTINATION ${CMAKE_BINARY_DIR}/inc)

		include_directories(${CMAKE_BINARY_DIR}/inc)

		# install scripts
		# file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/scripts)
		# file(COPY ${CMAKE_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX})

		set(CORE_LIB_NAME isis3)

		# Specify relative library include paths which will be set up on
		@@ -209,7 +208,6 @@ install(FILES "${CMAKE_BINARY_DIR}/qt.conf" DESTINATION ${CMAKE_INSTALL_PREFIX}/
		#Create the inc directory
		execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/inc)


		# Create an xml folder in the source directory that we will need later
		set(sourceXmlFolder ${CMAKE_BINARY_DIR}/bin/xml)
		execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/xml)
		@@ -224,22 +222,18 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX})
		add_subdirectory(src objects)

		# Set up third party libraries for installation
		install_third_party()

		# Some unit and app test rely on a 3rdParty structure and need to be copied
		execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/3rdParty ${CMAKE_BINARY_DIR}/3rdParty/lib ${CMAKE_BINARY_DIR}/3rdParty/plugins)

		# Create a link from the build/objects directory to each folder in 3rdPartyLibs/plugins.
		# - This is required so that the plugins can be found during unit tests.
		# TIP: Set "export QT_DEBUG_PLUGINS=1" to help debug plugin errors.
		foreach(plugin ${THIRDPARTYPLUGINFOLDERS})
		get_filename_component(pluginName ${plugin} NAME)
		if(NOT EXISTS ${CMAKE_BINARY_DIR}/lib/${pluginName})
		execute_process(COMMAND ln -s "${plugin}" ${pluginName}
		WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
		execute_process(COMMAND cp -r ${CMAKE_BINARY_DIR}/lib/${pluginName} ${CMAKE_BINARY_DIR}/3rdParty/plugins/)
		endif()
		endforeach()
		# install_third_party()

		# # Create a link from the build/objects directory to each folder in 3rdPartyLibs/plugins.
		# # - This is required so that the plugins can be found during unit tests.
		# # TIP: Set "export QT_DEBUG_PLUGINS=1" to help debug plugin errors.
		# foreach(plugin ${THIRDPARTYPLUGINFOLDERS})
		# get_filename_component(pluginName ${plugin} NAME)
		# if(NOT EXISTS ${CMAKE_BINARY_DIR}/lib/${pluginName})
		# execute_process(COMMAND ln -s "${plugin}" ${pluginName}
		# WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/lib")
		# endif()
		# endforeach()

		# Set up documentation build target.
		# - This script is called by running "make docs".

isis/cmake/AddIsisModule.cmake

+2 −3

Original line number	Diff line number	Diff line
		@@ -93,8 +93,6 @@ function(make_obj_unit_test moduleName testFile truthFile reqLibs pluginLibs)
		endfunction(make_obj_unit_test)




		# Incorporate a single obj folder
		function(add_isis_obj folder reqLibs)

		@@ -164,6 +162,7 @@ function(add_isis_obj folder reqLibs)
		# Folder with a plugin means that this is a separate library!
		# Add it here and then we are done with the source files.

		set(newSourceFiles ${thisSourceFiles} PARENT_SCOPE)
		if(NOT (${numPlugins} EQUAL 1))
		message( FATAL_ERROR "Error: Multiple plugins found in folder!" )
		endif()

isis/cmake/FindAllDependencies.cmake

+8 −5

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ if(APPLE)
		set(PLUGIN_DIR "${thirdPartyDir}/ports/libexec/qt5/plugins")
		endif(APPLE)

		set(JP2KFLAG 1)

		# Add thirdPartyCppFlags
		set(thirdPartyCppFlags ${thirdPartyCppFlags} -DGMM_USES_SUPERLU)
		@@ -37,6 +36,10 @@ find_program(PROTOC protoc REQUIRED)

		include(FindProtobuf)


		find_package(Geos 3.5.0 REQUIRED)


		if(APPLE)
		find_package(Qt5 COMPONENTS
		Core
		@@ -155,8 +158,10 @@ endif(APPLE)




		# Only include Kakadu if it is available
		if(${JP2KFLAG})
		message("ENABLING KAKADU")
		find_package(Kakadu)
		endif(${JP2KFLAG})

		@@ -194,7 +199,6 @@ foreach (_variableName ${_variableNames})
		endif(_variableName MATCHES "^CMAKE+")
		endforeach()

		#list(APPEND ALLLIBDIRS "/usr/lib64")
		list(REMOVE_DUPLICATES ALLLIBDIRS)
		list(REMOVE_DUPLICATES ALLLIBS)
		list(REMOVE_DUPLICATES ALLINCDIRS)
		@@ -332,7 +336,6 @@ set(RAW_DYNAMIC_LIBS ${QT_DYNAMIC_LIBS}

		# For each item in this list, expand the wildcard to get the actual library list.
		foreach(lib ${RAW_DYNAMIC_LIBS})

		string(FIND "${lib}" "*" position)
		if(${position} EQUAL -1)
		# No wildcard, just add it.

isis/cmake/FindBullet.cmake

+12 −0

Original line number	Diff line number	Diff line
		@@ -22,3 +22,15 @@ find_library(BULLET3_COMMON_LIBRARY NAMES Bullet3Collision)
		find_library(BULLET3_LINEARMATH_LIBRARY NAMES LinearMath)

		get_filename_component(BULLET_ROOT_INCLUDE_DIR "${BULLET_INCLUDE_DIR}" DIRECTORY)

		message( "BULLET INCLUDE: " ${BULLET_INCLUDE_DIR} )
		message( "BULLET OPENCL: " ${BULLET_OPENCL_LIBRARY} )
		message( "BULLET SOFTBODY: " ${BULLET_SOFTBODY_LIBRARY})
		message( "BULLET INVERSE DYNAMICS: " ${BULLET_INVERSEDYNAMICS_LIBRARY} )
		message( "BULLET DYNAMICS: " ${BULLET_DYNAMICS_LIBRARY} )
		message( "BULLET COLLISION: " ${BULLET_COLLISION_LIBRARY} )
		message( "BULLET GEOMETRY: " ${BULLET3_GEOMETRY_LIBRARY} )
		message( "BULLET3 DYNAMICS: " ${BULLET3_DYNAMICS_LIBRARY} )
		message( "BULLET3 COLLISION: " ${BULLET3_COLLISION_LIBRARY} )
		message( "BULLET3 COMMON: " ${BULLET3_COMMON_LIBRARY} )
		message( "BULLET3 LINEARMATH: " ${BULLET3_LINEARMATH_LIBRARY} )

isis/cmake/FindCSPICE.cmake

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,3 +13,6 @@ find_path(CSPICE_INCLUDE_DIR
		find_library(CSPICE_LIBRARY
		NAMES cspice
		)

		message( "CSPICE INCLUDE: " ${CSPICE_INCLUDE_DIR} )
		message( "CSPICE LIB: " ${CSPICE_LIBRARY} )