Commit 17c839b7 authored by Austin Sanders's avatar Austin Sanders Committed by amystamile-usgs
Browse files

Fully modularized core

parent d4664e27

isis/src/core/CMakeLists.txt

+27 −46
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.10)



project (CORE VERSION 0.0.1)

project (core VERSION 0.0.1)

option(buildStaticCore "Build libisis static as well as dynamic"        OFF )



list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")



# Short and long name of this package

set(PACKAGE            "CORE")
@@ -12,46 +13,16 @@ set(PACKAGE_NAME "USGS ISIS PVL CORE") 
set(CMAKE_CXX_STANDARD 11)

set(CMAKE_CXX_STANDARD_REQUIRED True)



#include cmake files from isis root

get_filename_component(PARENT_DIR ../../ ABSOLUTE)

list(APPEND CMAKE_MODULE_PATH ${PARENT_DIR}/cmake)

message(${CMAKE_MODULE_PATH})



include(Utilities)



FILE(GLOB_RECURSE Pvl_source_files ${PROJECT_SOURCE_DIR} *.h *.cpp)

list(FILTER Pvl_source_files EXCLUDE REGEX .*unitTest.cpp)



set(reqLibs

    geos

    Qt

)



FILE(GLOB_RECURSE Pvl_source_files ${PROJECT_SOURCE_DIR}/src *.cpp)



# Define a target

add_library(CORE "${Pvl_source_files}")

add_library(core "${Pvl_source_files}")



MACRO(SUBDIRLIST result curdir)

  FILE(GLOB children RELATIVE ${curdir} ${curdir}/*)

  SET(dirlist "")

  FOREACH(child ${children})

    IF(IS_DIRECTORY ${curdir}/${child})

      LIST(APPEND dirlist ${child})

    ENDIF()

  ENDFOREACH()

  SET(${result} ${dirlist})

ENDMACRO()



SUBDIRLIST(subdirs ${PROJECT_SOURCE_DIR})



target_include_directories(CORE PUBLIC ${subdirs})

target_include_directories(core PUBLIC ${PROJECT_SOURCE_DIR}/include)



find_package(Qt5 REQUIRED COMPONENTS

                Core

                Concurrent

                Gui

                Multimedia

                MultimediaWidgets

                Network

                OpenGL # Needed to install mesa-common-dev for this!

                PrintSupport
@@ -69,19 +40,29 @@ find_package(Qt5 REQUIRED COMPONENTS 
                # Search this path explicitly for MacOS OpenGL Framework

                PATHS /System/Library/Frameworks/ REQUIRED)



find_package(Json REQUIRED)

# find_package(Json REQUIRED)

find_package(Geos REQUIRED)

find_package(nlohmann_json REQUIRED)

find_package(CSPICE    65      REQUIRED)



include_directories(SYSTEM

                    ${Qt5Widgets_INCLUDE_DIRS}

                    ${Qt5Concurrent_INCLUDE_DIRS}

                    ${Qt5Network_INCLUDE_DIRS}

                    ${Qt5Xml_INCLUDE_DIRS}

                    ${CSPICE_INCLUDE_DIR}

                    ${JSON_INCLUDE_DIR})

include_directories(${CMAKE_BINARY_DIR}/inc)

link_directories(${JSON_LIBRARY} ${CSPICE_LIBRARY})



target_link_libraries(CORE PUBLIC Qt5 Geos Json nlohmann_json::nlohmann_json)
 
#include_directories(SYSTEM

#                    ${Qt5Widgets_INCLUDE_DIRS}

#                    ${Qt5Concurrent_INCLUDE_DIRS}

#                    ${Qt5Network_INCLUDE_DIRS}

#                    ${Qt5Xml_INCLUDE_DIRS}

#                    ${CSPICE_INCLUDE_DIR}

#                    ${JSON_INCLUDE_DIR})

#include_directories(${CMAKE_BINARY_DIR}/inc)

#link_directories(${JSON_LIBRARY} ${CSPICE_LIBRARY} {Qt5_Library})



target_link_libraries(core PUBLIC Qt5::Core

                                  Qt5::Concurrent

                                  Qt5::Widgets

                                  Qt5::Network

                                  Qt5::Xml

                                  nlohmann_json::nlohmann_json)



target_link_libraries(core PUBLIC ${GEOS_LIBRARY} ${CSPICE_LIBRARY})

target_include_directories(core PUBLIC ${GEOS_INCLUDE_DIR} ${CSPICE_INCLUDE_DIR})

install(DIRECTORY ${PROJECT_SOURCE_DIR}/include DESTINATION  ${CMAKE_INSTALL_PREFIX}/include/isis)

install(TARGETS core DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

isis/src/core/Constants/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
ifeq ($(ISISROOT), $(BLANK))

.SILENT:

error:

	echo "Please set ISISROOT";

else

	include $(ISISROOT)/make/isismake.objs

endif
 
 No newline at end of file

isis/src/core/FileName/FileName.truth

deleted100644 → 0
+0 −709

File deleted.

Preview size limit exceeded, changes collapsed.

isis/src/core/FileName/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
ifeq ($(ISISROOT), $(BLANK))

.SILENT:

error:

	echo "Please set ISISROOT";

else

	include $(ISISROOT)/make/isismake.objs

endif
 
 No newline at end of file

isis/src/core/IException/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
ifeq ($(ISISROOT), $(BLANK))

.SILENT:

error:

	echo "Please set ISISROOT";

else

	include $(ISISROOT)/make/isismake.objs

endif
 
 No newline at end of file