Merge pull request #2 from JuPedSim/release

Version 0.8.5

.gitlab-ci.yml

@@ -23,7 +23,7 @@ configure-linux:
   script:
     - mkdir -p build
     - cd build
-    - cmake -DCMAKE_BUILD_TYPE=Debug ..
+    - cmake -DCMAKE_BUILD_TYPE=Debug  -DDESIRED_QT_VERSION=4 ..
     - echo "configure | ${CI_PROJECT_DIR}"
   stage: configure
   tags:

CMakeLists.txt

@@ -46,7 +46,9 @@ endif()
 
 message( STATUS "Generating  ................................... ${PROJECT_NAME} (${JPSEDITOR_VERSION}) -- ${CMAKE_BUILD_TYPE}")
 if(APPLE )
+
   set(CMAKE_INSTALL_PREFIX "/tmp")
+
 endif()
 message(STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
 

jpseditor.pro

@@ -14,7 +14,7 @@
  # along with JuPedSim. If not, see <http://www.gnu.org/licenses/>.
  #
  # copyright   <2009-2018> Forschungszentrum Juelich GmbH.
- 
+
  # Compatibility with Qt4 and Qt5
 greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
 
@@ -100,13 +100,15 @@ SOURCES += \
 
 #INCLUDEPATH += D:/boost_1_59_0/boost_1_59_0
 
-RESOURCES += \ 
+RESOURCES += \
     Resources/resources.qrc
 
 RC_FILE = Resources/jpseditor.rc
 #osx fix
 ICON = Resources/jpseditor.icns
 
+demos.path = /usr/local/bin/jpseditor
+demos.files = examples/*
 
 CONFIG(debug, debug|release) {
     DESTDIR = build/debug
@@ -119,3 +121,8 @@ OBJECTS_DIR = $$DESTDIR/.obj
 MOC_DIR = $$DESTDIR/.moc
 RCC_DIR = $$DESTDIR/.qrc
 UI_DIR = $$DESTDIR/.u
+
+INSTALLS += demos
+
+target.path = /usr/local/bin/jpseditor
+INSTALLS += target

jpseditor.rb

@@ -1,7 +1,9 @@
 class Jpseditor < Formula
   desc "A graphical user interface to create the geometry of a scenario simulated by JuPedSim"
   homepage "https://www.jupedsim.org/"
-  head "https://github.com/JuPedSim/jpseditor.git"
+
+  head "https://github.com/JuPedSim/jpseditor.git" :branch => "develop"
+
 
   depends_on "cmake" => :build
   depends_on "qt"