Skip to content

Instantly share code, notes, and snippets.

@godber
Created December 28, 2015 15:26
Show Gist options
  • Save godber/f0e7b8cc48eadaab3633 to your computer and use it in GitHub Desktop.
Save godber/f0e7b8cc48eadaab3633 to your computer and use it in GitHub Desktop.
Patch to GMAT for OS X 10.11 using homebrewed dependencies.
From 1218660a7528a137e26b5fe38e58fb897f54f7e7 Mon Sep 17 00:00:00 2001
From: Austin Godber <godber@uberhip.com>
Date: Fri, 25 Dec 2015 13:36:10 -0700
Subject: [PATCH 1/2] trying just cmake variables
---
build/build.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/build/build.sh b/build/build.sh
index b1a32f6..7c98bcc 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -59,7 +59,13 @@ if [ "$arch" = "x86" ]
then
cmake -G "Unix Makefiles" -D GMAT_64_BIT=OFF ../../..
else
- cmake -G "Unix Makefiles" -D GMAT_64_BIT=ON ../../..
+ #cmake -G "Unix Makefiles" -D GMAT_64_BIT=ON ../../..
+ cmake -G "Unix Makefiles" \
+ -D CMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
+ -D wxWidgets_ROOT_DIR=/usr/local/Cellar/wxmac/3.0.2/bin \
+ -D GMAT_64_BIT=ON \
+ -D CSPICE_DIR=/usr/local/Cellar/cspice/65/ \
+ ../../..
fi
# Compile Gmat using all available cores
--
2.6.3
From 558d0c85d86768e19b620e91c1aa48e5d6951652 Mon Sep 17 00:00:00 2001
From: Austin Godber <godber@uberhip.com>
Date: Sun, 27 Dec 2015 11:23:29 -0700
Subject: [PATCH 2/2] fixed wxwidgets root dir
---
CMakeLists.txt | 2 +-
build/build.sh | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 471de06..8182a9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,7 +94,7 @@ elseif(UNIX)
# ... then get the expected path to the wx-config utility ...
if(APPLE)
- SET(wxWidgets_ROOT_DIR "${wxWidgets_PARTIAL_DIR}/wxWidgets-3.0.2/cocoa-install/bin" CACHE PATH "wxWidgets Root Directory")
+ SET(wxWidgets_ROOT_DIR "/usr/local/Cellar/wxmac/3.0.2/bin" CACHE PATH "wxWidgets Root Directory")
else()
SET(wxWidgets_ROOT_DIR "${wxWidgets_PARTIAL_DIR}/wxWidgets-3.0.2/gtk-install/bin" CACHE PATH "wxWidgets Root Directory")
endif()
diff --git a/build/build.sh b/build/build.sh
index 7c98bcc..4896fa6 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -62,7 +62,6 @@ else
#cmake -G "Unix Makefiles" -D GMAT_64_BIT=ON ../../..
cmake -G "Unix Makefiles" \
-D CMAKE_OSX_DEPLOYMENT_TARGET=10.11 \
- -D wxWidgets_ROOT_DIR=/usr/local/Cellar/wxmac/3.0.2/bin \
-D GMAT_64_BIT=ON \
-D CSPICE_DIR=/usr/local/Cellar/cspice/65/ \
../../..
--
2.6.3
@godber
Copy link
Author

godber commented Dec 28, 2015

This patch could be much more general. I've simply butchered the cmake list file to work in a brute force manner. I think this could be generalized to make a homebrew based installation but some refactoring of the cmake list file would need to be done and I am new to cmake so I didn't take the time to do this yet.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment