Skip to content

Commit

Permalink
Merge pull request #1 from magnific0/boostbuild
Browse files Browse the repository at this point in the history
Build BOOST within project.
  • Loading branch information
DominicDirkx committed Jan 28, 2016
2 parents bdc1139 + dd55dcd commit 43ea53b
Show file tree
Hide file tree
Showing 10,578 changed files with 20 additions and 2,070,104 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ doc/doxygen/latex/
build*/
bin/
lib/
boost/

#
# Editor related
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "jsoncpp"]
path = jsoncpp
url = https://github.com/open-source-parsers/jsoncpp.git
[submodule "boost"]
path = boost
url = https://github.com/boostorg/boost.git
18 changes: 16 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,30 @@
#

# Specify minimum CMake version required to compile Tudat.
cmake_minimum_required( VERSION 2.6 )
cmake_minimum_required( VERSION 2.8.10 )

# Specific Tudat project name.
project( TudatBundle )

set(BoostComponents filesystem system thread regex date_time unit_test_framework)

# Set root-directory for code to current source directory.
set(PROJECTROOT "${CMAKE_CURRENT_SOURCE_DIR}/")

enable_testing( )

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/tudat/Tudat/External/CMake/")

message(STATUS ${CMAKE_MODULE_PATH})
message(STATUS ${PROJECT_SOURCE_DIR})

find_package(Boost 1.53 COMPONENTS ${BoostComponents})
if(Boost_FOUND)
message(STATUS "Boost ${Boost_VERSION} found in ${Boost_INCLUDE_DIRS}")
else()
include(add_boost)
endif()

set(TUDAT_BUILD_DIR "${PROJECTROOT}/tudat")

#
Expand Down Expand Up @@ -87,6 +101,6 @@ add_subdirectory( "${PROJECTROOT}/nrlmsise-00/")
#
add_subdirectory( "${PROJECTROOT}/tudat/Tudat/")
add_subdirectory( "${PROJECTROOT}/tudatExampleApplications/satellitePropagatorExamples/SatellitePropagatorExamples/")
add_subdirectory( "${PROJECTROOT}/tudatExampleApplications/libraryExamples/SpiceAndJSON/")
#add_subdirectory( "${PROJECTROOT}/tudatExampleApplications/libraryExamples/SpiceAndJSON/")
#add_subdirectory( "${PROJECTROOT}/tudatExampleApplications/templateApplication/TemplateApplication")

27 changes: 0 additions & 27 deletions boost/boost/accumulators/accumulators.hpp

This file was deleted.

230 changes: 0 additions & 230 deletions boost/boost/accumulators/accumulators_fwd.hpp

This file was deleted.

65 changes: 0 additions & 65 deletions boost/boost/accumulators/framework/accumulator_base.hpp

This file was deleted.

Loading

0 comments on commit 43ea53b

Please sign in to comment.