Skip to content
Open
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
58 changes: 58 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,61 @@ files/*
build/*
perf.data
extern/*
libs/*
cgal/*
assets/*

### C++ ###
# Prerequisites
*.d

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

### CMake ###
CMakeLists.txt.user
CMakeCache.txt
CMakeFiles
CMakeScripts
Testing
cmake_install.cmake
CAE_autogen/
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps

### CMake Patch ###
CMakeUserPresets.json

# External projects
*-prefix/
8 changes: 4 additions & 4 deletions deployment/create_appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ bash $DIR/../scripts/linux/download_file_if_not_exists.sh "logo"
cp $DIR/assets/logo.png $appimage_folder/

# download linuxdeployqt to extern/
if [ ! -f "extern/linuxdeployqt-6-x86_64.AppImage" ]; then
if [ ! -f "extern/linuxdeployqt-continuous-x86_64.AppImage" ]; then
mkdir -p extern
cd extern
wget https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage
chmod a+x linuxdeployqt-6-x86_64.AppImage
wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
cd ..
fi

Expand All @@ -49,6 +49,6 @@ cp -r $assets_path $appimage_folder
# create app image
cd $appimage_folder

../extern/linuxdeployqt-6-x86_64.AppImage ./CAE -appimage -unsupported-allow-new-glibc -extra-plugins=iconengines
../extern/linuxdeployqt-continuous-x86_64.AppImage ./CAE -appimage -unsupported-allow-new-glibc -extra-plugins=iconengines


30 changes: 30 additions & 0 deletions install_libs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
#!/bin/bash

# Install required dependencies for CAE project

# Update package list
sudo apt-get update

# Install build tools and libraries
sudo apt-get install -y \
build-essential \
cmake \
libglew-dev \
freeglut3-dev \
libboost-all-dev \
libmpfr-dev \
libgmp3-dev \
libxmu-dev \
libxi-dev \
qtbase5-dev \
qt5-qmake \
qttools5-dev \
qttools5-dev-tools

# Clone CGAL library
if [ ! -d "cgal" ]; then
git clone https://github.com/CGAL/cgal.git
echo "CGAL cloned successfully"
else
echo "CGAL directory already exists, skipping clone"
fi
8 changes: 5 additions & 3 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,15 @@ find_package(OpenGL REQUIRED)
target_link_libraries(CAE
Qt5::OpenGL
Qt5::Widgets
${Boost_LIBRARIES}
Boost::filesystem
Boost::thread
Boost::system
${sdl_LIBRARIES}
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${OPENGL_LIBRARIES}
${GLUT_LIBRARY}
${GLEW_SHARED_LIBRARY_RELEASE}
GLUT::GLUT
GLEW::GLEW
)

if (WIN32 AND NOT USE_SYSTEM_BOOST)
Expand Down
2 changes: 2 additions & 0 deletions src/data_structures/tree/TreeTraverser.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#include <stack>
#include <tuple>
#include <vector>
#include <cstddef>


// Forward Declarations
template <class T, class L>
Expand Down
1 change: 1 addition & 0 deletions src/multi_threading/StepperThread.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define STEPPERTHREAD_H

#include <atomic>
#include <memory>
#include <thread>
#include <vector>

Expand Down
2 changes: 1 addition & 1 deletion src/simulation/SimulationModule.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "SimulationModule.h"

#include <ApplicationControl.h>
#include <QWidget>
#include <QtWidgets/QWidget>

#include <simulation/ui/SimulationUIControl.h>

Expand Down
1 change: 1 addition & 0 deletions src/utils/OwnerMemberAccessorInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "MemberAccessorInterface.h"

#include <cstddef>
#include <functional>
#include <vector>

Expand Down