Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
JPSvis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JuPedSim
JPSvis
Commits
b96e95d8
Commit
b96e95d8
authored
9 years ago
by
Mohcine Chraibi
Browse files
Options
Downloads
Patches
Plain Diff
Add script to deploy vis
parent
0f0f53fa
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+66
-31
66 additions, 31 deletions
CMakeLists.txt
install_packages_debian.txt
+8
-2
8 additions, 2 deletions
install_packages_debian.txt
with
74 additions
and
33 deletions
CMakeLists.txt
+
66
−
31
View file @
b96e95d8
...
@@ -186,6 +186,7 @@ find_package(VTK REQUIRED)
...
@@ -186,6 +186,7 @@ find_package(VTK REQUIRED)
if
(
VTK_FOUND
)
if
(
VTK_FOUND
)
message
(
STATUS
"found VTK. Version: "
${
VTK_VERSION
}
" | VTK_DIR: "
${
VTK_DIR
}
)
message
(
STATUS
"found VTK. Version: "
${
VTK_VERSION
}
" | VTK_DIR: "
${
VTK_DIR
}
)
message
(
STATUS
"VTK_QT_Version: "
${
VTK_QT_VERSION
}
)
message
(
STATUS
"VTK_QT_Version: "
${
VTK_QT_VERSION
}
)
message
(
STATUS
"VTK_LIBraries: "
${
VTK_LIBRARIES
}
)
else
(
VTK_FOUND
)
else
(
VTK_FOUND
)
message
(
FATAL_ERROR
message
(
FATAL_ERROR
"Cannot build the executable without VTK. Please set the
"Cannot build the executable without VTK. Please set the
...
@@ -312,24 +313,24 @@ endif()
...
@@ -312,24 +313,24 @@ endif()
#======================================================================
#======================================================================
# debug where is python?
# debug where is python?
foreach
(
REQUIRED_PYTHON_VERSION 2.7
)
# 2.6 2.5)
#
foreach(REQUIRED_PYTHON_VERSION 2.7) # 2.6 2.5)
message
(
STATUS
"======== LOOKING FOR
${
REQUIRED_PYTHON_VERSION
}
========================"
)
#
message(STATUS "======== LOOKING FOR ${REQUIRED_PYTHON_VERSION} ========================")
# find_package ( PythonInterp ${REQUIRED_PYTHON_VERSION} REQUIRED)
#
# find_package ( PythonInterp ${REQUIRED_PYTHON_VERSION} REQUIRED)
# find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT)
#
# find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT)
# find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED )
#
# find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED )
message
(
STATUS
"PYTHON_EXECUTABLE:FILEPATH=
${
PYTHON_EXECUTABLE
}
"
)
#
message(STATUS "PYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}")
message
(
STATUS
"PYTHON_LIBRARY:FILEPATH=
${
PYTHON_LIBRARY
}
"
)
#
message(STATUS "PYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}")
message
(
STATUS
"PYTHON_INCLUDE_DIR:FILEPATH=
${
PYTHON_INCLUDE_DIR
}
"
)
#
message(STATUS "PYTHON_INCLUDE_DIR:FILEPATH=${PYTHON_INCLUDE_DIR}")
message
(
STATUS
"PYTHON_FRAMEWORK_INCLUDES=
${
PYTHON_FRAMEWORK_INCLUDES
}
"
)
#
message(STATUS "PYTHON_FRAMEWORK_INCLUDES=${PYTHON_FRAMEWORK_INCLUDES}")
message
(
STATUS
"PYTHONLIBS_VERSION_STRING=
${
PYTHONLIBS_VERSION_STRING
}
"
)
#
message(STATUS "PYTHONLIBS_VERSION_STRING=${PYTHONLIBS_VERSION_STRING}")
message
(
STATUS
"Python_FRAMEWORKS=
${
Python_FRAMEWORKS
}
"
)
#
message(STATUS "Python_FRAMEWORKS=${Python_FRAMEWORKS}")
# unset(PYTHON_EXECUTABLE CACHE)
#
# unset(PYTHON_EXECUTABLE CACHE)
# unset(PYTHON_LIBRARY CACHE)
#
# unset(PYTHON_LIBRARY CACHE)
# unset(PYTHON_INCLUDE_DIR CACHE)
#
# unset(PYTHON_INCLUDE_DIR CACHE)
endforeach
()
#
endforeach()
# For Apple set the icns file containing icons
# For Apple set the icns file containing icons
...
@@ -432,12 +433,14 @@ ENDIF(WIN32)
...
@@ -432,12 +433,14 @@ ENDIF(WIN32)
#--------------------------------------------------------------------------------
#--------------------------------------------------------------------------------
# Install the QtTest application, on Apple, the bundle is at the root of the
# Install the QtTest application, on Apple, the bundle is at the root of the
# install tree, and on other platforms it'll go into the bin directory.
# install tree, and on other platforms it'll go into the bin directory.
MESSAGE
(
STATUS
"
${
PROJECT_NAME
}
will be installed to
${
CMAKE_INSTALL_PREFIX
}
"
)
INSTALL
(
TARGETS JPSvis
INSTALL
(
TARGETS JPSvis
BUNDLE DESTINATION . COMPONENT Runtime
BUNDLE DESTINATION . COMPONENT Runtime
RUNTIME DESTINATION bin COMPONENT Runtime
RUNTIME DESTINATION bin COMPONENT Runtime
)
)
#--------------------------------------------------------------------------------
#--------------------------------------------------------------------------------
# Install needed Qt plugins by copying directories from the qt installation
# Install needed Qt plugins by copying directories from the qt installation
# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
...
@@ -488,7 +491,7 @@ IF(APPLE)
...
@@ -488,7 +491,7 @@ IF(APPLE)
ENDIF
(
APPLE
)
ENDIF
(
APPLE
)
SET
(
CPACK_RESOURCE_FILE_README
"
${
README_FILE
}
"
)
# To Create a package, one can run "cpack -G DragNDrop CPackConfig.cmake" on Mac OS X
# To Create a package, one can run "cpack -G DragNDrop CPackConfig.cmake" on Mac OS X
# where CPackConfig.cmake is created by including CPack
# where CPackConfig.cmake is created by including CPack
...
@@ -496,17 +499,30 @@ ENDIF(APPLE)
...
@@ -496,17 +499,30 @@ ENDIF(APPLE)
set
(
CPACK_BINARY_DRAGNDROP ON
)
set
(
CPACK_BINARY_DRAGNDROP ON
)
set
(
CPACK_PACKAGE_NAME
"jpsvis"
)
set
(
CPACK_PACKAGE_NAME
"jpsvis"
)
set
(
CPACK_PACKAGE_VENDOR
"www.jupedsim.org"
)
set
(
CPACK_PACKAGE_VENDOR
"www.jupedsim.org"
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"
MyLib
- CPack Component Installation Example"
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"
JPSvis
- CPack Component Installation Example"
)
set
(
CPACK_PACKAGE_VERSION
"1.0.0"
)
set
(
CPACK_PACKAGE_VERSION
"1.0.0"
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
"1"
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
"1"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"0"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"0"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"0"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"0"
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"
CPack Component Example
"
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"
JPSvis_dir
"
)
include
(
CPack
)
if
(
APPLE
)
set
(
CPACK_GENERATOR
"DragNDrop"
)
set
(
CPACK_DMG_FORMAT
"UDBZ"
)
set
(
CPACK_DMG_VOLUME_NAME
"
${
PROJECT_NAME
}
"
)
set
(
CPACK_SYSTEM_NAME
"OSX"
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
PROJECT_NAME
}
-
${
JPSVIS_VERSION
}
"
)
endif
()
include
(
CPack
)
message
(
STATUS
"bin install dir"
${
BIN_INSTALL_DIR
}
)
if
(
UNIX AND NOT APPLE
)
set
(
BIN_INSTALL_DIR
"bin"
)
else
()
set
(
BIN_INSTALL_DIR
"."
)
set
(
DOC_INSTALL_DIR
"."
)
endif
()
message
(
STATUS
"bin install dir: "
${
BIN_INSTALL_DIR
}
)
set
(
CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION
"
${
BIN_INSTALL_DIR
}
"
)
set
(
CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION
"
${
BIN_INSTALL_DIR
}
"
)
include
(
InstallRequiredSystemLibraries
)
include
(
InstallRequiredSystemLibraries
)
...
@@ -518,12 +534,31 @@ else()
...
@@ -518,12 +534,31 @@ else()
set
(
EXECUTABLE
"
${
BIN_INSTALL_DIR
}
/
${
PROJECT_NAME
}${
CMAKE_EXECUTABLE_SUFFIX
}
"
)
set
(
EXECUTABLE
"
${
BIN_INSTALL_DIR
}
/
${
PROJECT_NAME
}${
CMAKE_EXECUTABLE_SUFFIX
}
"
)
endif
()
endif
()
if
(
APPLE OR WIN32
)
# https://github.com/artm/vision-ui-skeleton/blob/master/cmake/QArtmRelease.cmake
if
(
${
QT4_INSTALLED
}
)
IF
(
APPLE
)
include
(
DeployQt4
)
SET
(
EXE_CONTENTS
"
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
EXECUTABLE
}
/Contents"
)
install_qt4_executable
(
"
${
EXECUTABLE
}
"
"qsqlite"
)
FILE
(
WRITE
elseif
(
${
QT4_INSTALLED
}
)
${
EXE_CONTENTS
}
/Resources/qt.conf
include
(
DeployQt5
)
"[Paths]
\n
Plugins=PlugIns
\n
"
)
install_qt5_executable
(
"
${
EXECUTABLE
}
"
"qsqlite"
)
FILE
(
COPY
${
QT_PLUGINS_DIR
}
/imageformats
endif
()
DESTINATION
${
EXE_CONTENTS
}
/PlugIns/
endif
()
PATTERN
"*_debug.*"
EXCLUDE
)
ADD_CUSTOM_COMMAND
(
TARGET
${
PROJECT_NAME
}
POST_BUILD
COMMAND ruby
${
CMAKE_SOURCE_DIR
}
/ruby/fixup/fixup.rb
${
EXECUTABLE
}
COMMENT
"Fixing up the app bundle"
)
ENDIF
(
APPLE
)
# if(APPLE OR WIN32)
# if(${QT4_INSTALLED})
# include(DeployQt4)
# install_qt4_executable("${EXECUTABLE}" "qsqlite")
# elseif(${QT4_INSTALLED})
# include(DeployQt5)
# install_qt5_executable("${EXECUTABLE}" "qsqlite")
# endif()
# endif()
# message(STATUS "verify app")
# verify_app(${EXECUTABLE})
\ No newline at end of file
This diff is collapsed.
Click to expand it.
install_packages_debian.txt
+
8
−
2
View file @
b96e95d8
MAc
* Try deploy APPEL
- dylibbundler -od -b -x ../bin/JPSvis.app/Contents/MacOS/JPSvis -d ../bin/JPSvis.app/Contents/libs/
- macdeployqt ../bin/JPSvis.app -dmg
* Install packages for APPEL
brew update
brew update
# brew uninstall vtk
# brew uninstall vtk
brew install vtk --with-qt --without-python --without-boost --build-from-source
brew install vtk --with-qt --without-python --without-boost --build-from-source
Debian 7.7
* Install packages for
Debian 7.7
sudo apt-get install libmgl-qt5
sudo apt-get install libmgl-qt5
sudo apt-get install libvtk5-dev
sudo apt-get install libvtk5-dev
sudo apt-get install libvtk5.8-qt4
sudo apt-get install libvtk5.8-qt4
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment