Skip to content

Commit

Permalink
Version 2017a
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher Rabotin committed Apr 3, 2019
1 parent 37201a6 commit ae05018
Show file tree
Hide file tree
Showing 11,398 changed files with 84,197 additions and 7,793,743 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 3 additions & 0 deletions .directory
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Dolphin]
Timestamp=2019,4,3,14,37,12
Version=4
36 changes: 7 additions & 29 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#

# Require CMake minimum version
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.7.0)
CMAKE_POLICY(VERSION 3.5)

# Support OSX 10.8+ -> go to 10.10 as minimum
Expand All @@ -30,7 +30,7 @@ ENDIF()

# Set Cmake project
PROJECT(GMAT C CXX)
SET(GMAT_RELEASE_NAME "R2016a" CACHE STRING "GMAT version name")
SET(GMAT_RELEASE_NAME "R2017a" CACHE STRING "GMAT version name")
SET(GMAT_VERSION ${GMAT_RELEASE_NAME})

# Enforce C++11
Expand All @@ -41,11 +41,13 @@ SET(CMAKE_CXX_EXTENSIONS OFF)
# Path to custom Find****.cmake files
SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/build/cmake_modules")

# Detect 32/64 bit
# Detect 32/64 bit compiler
if(CMAKE_CL_64 OR (CMAKE_SIZEOF_VOID_P EQUAL 8))
SET(GMAT_64_BIT ON)
MESSAGE(STATUS "*** Creating 64-bit GMAT Build System. Please ensure that 64-bit versions of all dependencies are available. ***")
else()
SET(GMAT_64_BIT OFF)
MESSAGE(STATUS "*** Creating 32-bit GMAT Build System. Please ensure that 32-bit versions of all dependencies are available. ***")
endif()

# Default to Release configuration on single-config generators
Expand Down Expand Up @@ -197,9 +199,7 @@ SET(MATLAB_ADDITIONAL_VERSIONS
"R2016b=9.1"
CACHE STRING "Additional searched MATLAB versions. Format as semicolon-separated Release=Version pairs, e.g. R20YYx=V.v"
)
SET(Matlab_MAT_LIBRARY "Matlab_MAT_LIBRARY-NOTFOUND" CACHE FILEPATH "Path to libmat" FORCE)
MARK_AS_ADVANCED(CLEAR Matlab_MAT_LIBRARY)
FIND_PACKAGE(Matlab COMPONENTS MAIN_PROGRAM MX_LIBRARY ENG_LIBRARY)
FIND_PACKAGE(Matlab COMPONENTS MAIN_PROGRAM MX_LIBRARY ENG_LIBRARY MAT_LIBRARY)

if(NOT Matlab_FOUND)
IF(GMAT_64_BIT)
Expand All @@ -208,26 +208,6 @@ if(NOT Matlab_FOUND)
SET(MATLAB_BIT 32-bit)
ENDIF()
MESSAGE(WARNING "${MATLAB_BIT} Matlab NOT FOUND. Set Matlab_ROOT_DIR to the path to Matlab and ensure you have a working license.")
else()
# Find libmat, which is not currently found by CMake's FindMatlab module
GET_FILENAME_COMPONENT(Matlab_LIB_DIR ${Matlab_MEX_LIBRARY} DIRECTORY)
IF(WIN32)
# Needed since Matlab prepends "lib" to library names on Windows
SET(Matlab_MAT_NAME libmat)
ELSE()
SET(Matlab_MAT_NAME mat)
ENDIF()
FIND_LIBRARY(Matlab_MAT_LIBRARY
${Matlab_MAT_NAME}
PATHS ${Matlab_LIB_DIR}
NO_DEFAULT_PATH
)
if(Matlab_MAT_LIBRARY)
SET(Matlab_LIBRARIES ${Matlab_LIBRARIES} ${Matlab_MAT_LIBRARY})
MARK_AS_ADVANCED(FORCE Matlab_MAT_LIBRARY)
else()
MESSAGE(WARNING "libmat NOT FOUND. Please contact GMAT support with this error.")
endif()
endif()

# ====================================================================
Expand Down Expand Up @@ -342,12 +322,10 @@ if(WIN32)
ADD_DEFINITIONS("/wd4430 /wd4251 /wd4231 /wd4996 /nologo")
endif()

# Set 64 bit Definitions and directories
# Set 32/64-bit specific definitions and directories
if(GMAT_64_BIT)
MESSAGE(STATUS "Will compile 64-bit GMAT")
ADD_DEFINITIONS("-DUSE_64_BIT_LONGS")
else()
MESSAGE(STATUS "Will compile 32-bit GMAT")
endif()

# Additional *NIX-specific definitions
Expand Down
351 changes: 0 additions & 351 deletions LinuxPrefs.epf

This file was deleted.

12 changes: 12 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
The GMAT build system is configured using CMAKE. Please see the instructions at

http://gmatcentral.org/display/GW/GMAT+CMake+Build+System

for additional information.

Note that users building GMAT from source will need the GMAT data files package,

GMAT-datafiles-R2017a.zip

from SourceForge in order to run GMAT. The data folder in that package should
be placed, with all subfolders, into the GMAT application folder.
Binary file removed ThirdParty/Gmat3rdPartyLinux64.tar.gz
Binary file not shown.
3 changes: 3 additions & 0 deletions application/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
/MyFiles/
/FluxfileTests/
/Measurements/
/Ephems/
/input/
/MyScripts
Loading

0 comments on commit ae05018

Please sign in to comment.