Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ lib/libglvis.js
lib/libglvis.a
share/logo.rgba.bin.cpp
glvis
GLVis.app

# Output from running glvis
GLVis.pdf
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ Version 4.0.1 (development)

- Replace pthreads and POSIX-specific code with C++11 standard thread library.

- Added build target ("make app") to build a native Mac OS application bundle
that can be double-clicked, added to the Dock, etc.


Version 4.0, released on Dec 11, 2020
=====================================
Expand Down
19 changes: 19 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -309,3 +309,22 @@ if(NOT EMSCRIPTEN)
endif (MFEM_USE_GNUTLS)

endif(NOT EMSCRIPTEN)

add_custom_target(app
COMMAND ${CMAKE_COMMAND} -E make_directory GLVis.app/Contents/MacOS
COMMAND ${CMAKE_COMMAND} -E make_directory GLVis.app/Contents/Resources
COMMAND ${CMAKE_COMMAND} -E copy glvis GLVis.app/Contents/MacOS/
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/share/Info.plist GLVis.app/Contents
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/share/GLVis.icns
GLVis.app/Contents/Resources/
COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/share/Credits.rtf
GLVis.app/Contents/Resources/
DEPENDS
glvis-exe
GLVis.app/Contents/Info.plist
GLVis.app/Contents/Resources/GLVis.icns
GLVis.app/Contents/Resources/Credits.rtf
VERBATIM)
4 changes: 4 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Some of the available 'make' targets are:
make -> Builds the glvis binary, using the MFEM compiler and options
make opt -> Builds an optimized version
make debug -> Builds a debug version
make app -> Builds a Mac OS application bundle
make clean -> Cleans the build
make style -> Format the code with Artistic Style.
make help -> Prints a short help message
Expand Down Expand Up @@ -191,6 +192,9 @@ Some building considerations
Note that while this avoids the hard error, and allows for real-time
visualization, occasional hangs have been reported with this method.

- On Mac OS X, GLVis can be built as a native application bundle using the 'make
app' target (with both the makefile and CMake build systems).

Dependency building instructions
================================
Note that using the build locations given below will let the GLVis build systems
Expand Down
12 changes: 12 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ GLVis makefile targets:
make
make status/info
make install
make app
make clean
make distclean
make style
Expand All @@ -30,6 +31,8 @@ make status
Display information about the current configuration.
make install PREFIX=<dir>
Install the glvis executable in <dir>.
make app
Build a Mac OS application bundle.
make clean
Clean the glvis executable, library and object files.
make distclean
Expand Down Expand Up @@ -297,6 +300,7 @@ clean:
rm -rf lib/*.o lib/*.bc lib/gl/*.o lib/gl/*.bc lib/*~ *~ glvis
rm -rf $(LOGO_FILE_CPP) share/*.o
rm -rf lib/libglvis.a lib/libglvis.js *.dSYM
rm -rf GLVis.app

distclean: clean
rm -rf bin/
Expand All @@ -309,6 +313,14 @@ ifeq ($(MFEM_USE_GNUTLS),YES)
$(INSTALL) -m 750 glvis-keygen.sh $(PREFIX)
endif

app: glvis
mkdir -p GLVis.app/Contents/MacOS
mkdir -p GLVis.app/Contents/Resources
cp share/Info.plist GLVis.app/Contents
cp glvis GLVis.app/Contents/MacOS
cp share/GLVis.icns GLVis.app/Contents/Resources
cp share/Credits.rtf GLVis.app/Contents/Resources

help:
$(info $(value GLVIS_HELP_MSG))
@true
Expand Down
15 changes: 15 additions & 0 deletions share/Credits.rtf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{\rtf1\ansi\ansicpg1252\cocoartf2580
\cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;;}
\margl1440\margr1440\vieww15100\viewh8040\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\sl288\slmult1\pardirnatural\qc\partightenfactor0
{\field{\*\fldinst{HYPERLINK "https://glvis.org"}}{\fldrslt
\f0\b\fs26 \cf0 glvis.org}}
\f1\fs24 \
\
GLVis is a tool for accurate and flexible OpenGL visualization of finite element solutions based on the {\field{\*\fldinst{HYPERLINK "https://mfem.org"}}{\fldrslt MFEM}} finite element library.\

\fs12 \

\fs24 Developed by the GLVis team at {\field{\*\fldinst{HYPERLINK "https://computing.llnl.gov/casc"}}{\fldrslt CASC}}, {\field{\*\fldinst{HYPERLINK "https://www.llnl.gov"}}{\fldrslt LLNL}}.}
Binary file added share/GLVis.icns
Binary file not shown.
22 changes: 22 additions & 0 deletions share/Info.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>glvis</string>
<key>CFBundleIdentifier</key>
<string>org.glvis</string>
<key>CFBundleName</key>
<string>GLVis</string>
<key>CFBundleIconFile</key>
<string>GLVis.icns</string>
<key>CFBundleShortVersionString</key>
<string>4.0.1</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>NSHighResolutionCapable</key>
<true/>
</dict>
</plist>