Merge branch 'master' into release

JuPedSim · Nov 2, 2018 · 72b919c · 72b919c
2 parents 66098b7 + f040b50
commit 72b919c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -46,7 +46,9 @@ endif()
 
 message( STATUS "Generating  ................................... ${PROJECT_NAME} (${JPSEDITOR_VERSION}) -- ${CMAKE_BUILD_TYPE}")
 if(APPLE )
-  set(CMAKE_INSTALL_PREFIX "/Applications")
+
+  set(CMAKE_INSTALL_PREFIX "/tmp")
+
 endif()
 message(STATUS "${PROJECT_NAME} will be installed to ${CMAKE_INSTALL_PREFIX}")
 

diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/jpseditor.pro b/jpseditor.pro
@@ -107,6 +107,8 @@ 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
@@ -120,9 +122,6 @@ MOC_DIR = $$DESTDIR/.moc
 RCC_DIR = $$DESTDIR/.qrc
 UI_DIR = $$DESTDIR/.u
 
-demos.path = /usr/local/bin/jpseditor
-demos.files = examples/*
-
 INSTALLS += demos
 
 target.path = /usr/local/bin/jpseditor

diff --git a/jpseditor.rb b/jpseditor.rb
@@ -1,8 +1,10 @@
 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" :branch => "develop"
 
+
   depends_on "cmake" => :build
   depends_on "qt"