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
69dc5352
Commit
69dc5352
authored
6 years ago
by
Mohcine Chraibi
Browse files
Options
Downloads
Patches
Plain Diff
fix install part
parent
7b072d95
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+13
-19
13 additions, 19 deletions
CMakeLists.txt
with
13 additions
and
19 deletions
CMakeLists.txt
+
13
−
19
View file @
69dc5352
...
...
@@ -223,12 +223,6 @@ ENDIF (WIN32)
#--------------- here comes QT. Version problem (4 or 5?)
# cmake does not provide findqt5-modules
#message(STATUS "QT_Qmake_executable " ${QT_QMAKE_EXECUTABLE})
if
(
$QT_QMAKE_EXECUTABLE STREQUAL
""
)
FIND_PROGRAM
(
QT_QMAKE_EXECUTABLE NAMES qmake
)
if
(
NOT QT_QMAKE_EXECUTABL
)
message
(
WARNING
"Check Qt ... no"
)
endif
()
endif
()
# default qt version is 4
if
(
"
${
DESIRED_QT_VERSION
}
"
STREQUAL
""
)
set
(
DESIRED_QT_VERSION
"5"
)
...
...
@@ -401,7 +395,7 @@ add_definitions("-DUSED_COMPILER=\"${USED_COMPILER}\"")
# 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
(
TARGETS jpsvis
BUNDLE DESTINATION
.
COMPONENT Runtime
BUNDLE DESTINATION
${
CMAKE_INSTALL_PREFIX
}
COMPONENT Runtime
RUNTIME DESTINATION bin COMPONENT Runtime
)
...
...
@@ -409,14 +403,14 @@ INSTALL(TARGETS jpsvis
#--------------------------------------------------------------------------------
# Install needed Qt plugins by copying directories from the qt installation
# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
INSTALL
(
DIRECTORY
"
${
QT_PLUGINS_DIR
}
/imageformats"
DESTINATION
${
plugin_dest_dir
}
/plugins COMPONENT Runtime
)
#
INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION ${plugin_dest_dir}/plugins COMPONENT Runtime)
#--------------------------------------------------------------------------------
# install a qt.conf file
# this inserts some cmake code into the install script to write the file
INSTALL
(
CODE
"
file(WRITE
\"\$
{CMAKE_INSTALL_PREFIX}/
${
qtconf_dest_dir
}
/qt.conf
\"
\"\"
)
"
COMPONENT Runtime
)
#
INSTALL(CODE "
#
file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${qtconf_dest_dir}/qt.conf\" \"\")
#
" COMPONENT Runtime)
#--------------------------------------------------------------------------------
...
...
@@ -437,14 +431,14 @@ message(STATUS "qt_lib_dirs ${QT_LIBRARY_DIRS}")
# An alternative is the do a configure_file() on a script and use install(SCRIPT ...).
# Note that the image plugins depend on QtSvg and QtXml, and it got those copied
# over.
if
(
APPLE
)
INSTALL
(
CODE
"
file(GLOB_RECURSE QTPLUGINS
\"\$
{CMAKE_INSTALL_PREFIX}/
${
plugin_dest_dir
}
/plugins/*
${
CMAKE_SHARED_LIBRARY_SUFFIX
}
\"
)
include(BundleUtilities)
fixup_bundle(
\"
${
APPS
}
\"
\"\$
{QTPLUGINS}
\"
\"
${
DIRS
}
\"
)
"
COMPONENT Runtime
)
endif
()
#
if(APPLE)
#
INSTALL(CODE "
#
file(GLOB_RECURSE QTPLUGINS
#
\"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
#
include(BundleUtilities)
#
fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
#
" COMPONENT Runtime)
#
endif()
IF
(
APPLE
)
# set how it shows up in the Info.plist file
...
...
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