Commit 7aab8dea authored by Austin Sanders's avatar Austin Sanders Committed by amystamile-usgs
Browse files

Fully modularized core

parent 17c839b7

isis/cmake/AddIsisModule.cmake

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ function(add_isis_module name) 
  # - Base module depends on 3rd party libs, other libs also depend on base.

  # - Only the base module gets both a static and shared library.

  if(${name} STREQUAL ${CORE_LIB_NAME})

    set(reqLibs "${ALLLIBS};${CMAKE_THREAD_LIBS_INIT}")

    set(reqLibs "${ALLLIBS};core;${CMAKE_THREAD_LIBS_INIT}")

    set(alsoStatic ON)

  else()

    set(reqLibs "${CORE_LIB_NAME};${ALLLIBS};${CMAKE_THREAD_LIBS_INIT}")

isis/src/CMakeLists.txt

+3 −0
Original line number Diff line number Diff line 
#===============================================================================

set(CORE_LIST base database control qisis system socet dev)



include_directories(".")

get_subdirectory_list(${CMAKE_CURRENT_LIST_DIR} modules)



# build core into isis library
@@ -13,6 +14,8 @@ foreach(core ${CORE_LIST}) 
  list(REMOVE_ITEM modules "${CMAKE_CURRENT_LIST_DIR}/${core}")

endforeach()



list(REMOVE_ITEM modules "${CMAKE_CURRENT_LIST_DIR}/core")



foreach( mod ${modules} )

  string(REPLACE "${CMAKE_CURRENT_LIST_DIR}/" "" strippedmod ${mod})

  add_isis_module(${strippedmod} ${strippedmod})