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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JuPedSim
JPSvis
Commits
21827c33
Commit
21827c33
authored
9 years ago
by
Mohcine Chraibi
Browse files
Options
Downloads
Patches
Plain Diff
JPSvis is Retina Ready :-)
parent
c4f794b4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+33
-0
33 additions, 0 deletions
CMakeLists.txt
Resources/Info.plist.in
+38
-0
38 additions, 0 deletions
Resources/Info.plist.in
with
71 additions
and
0 deletions
CMakeLists.txt
+
33
−
0
View file @
21827c33
...
@@ -242,6 +242,27 @@ elseif( ${QT5_INSTALLED} )
...
@@ -242,6 +242,27 @@ elseif( ${QT5_INSTALLED} )
qt5_wrap_ui
(
SAMPLE_UI_HDRS
${
SAMPLE_UIS
}
)
qt5_wrap_ui
(
SAMPLE_UI_HDRS
${
SAMPLE_UIS
}
)
endif
()
endif
()
# debug where is python?
# foreach(REQUIRED_PYTHON_VERSION 2.7 2.6 2.5)
# message(STATUS "======== LOOKING FOR ${REQUIRED_PYTHON_VERSION} ========================")
# find_package ( PythonInterp ${REQUIRED_PYTHON_VERSION} REQUIRED)
# find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT)
# #find_package ( PythonLibs ${PYTHON_VERSION_STRING} EXACT REQUIRED )
# message(STATUS "PYTHON_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE}")
# message(STATUS "PYTHON_LIBRARY:FILEPATH=${PYTHON_LIBRARY}")
# message(STATUS "PYTHON_INCLUDE_DIR:FILEPATH=${PYTHON_INCLUDE_DIR}")
# message(STATUS "PYTHON_FRAMEWORK_INCLUDES=${PYTHON_FRAMEWORK_INCLUDES}")
# message(STATUS "PYTHONLIBS_VERSION_STRING=${PYTHONLIBS_VERSION_STRING}")
# message(STATUS "Python_FRAMEWORKS=${Python_FRAMEWORKS}")
# unset(PYTHON_EXECUTABLE CACHE)
# unset(PYTHON_LIBRARY CACHE)
# unset(PYTHON_INCLUDE_DIR CACHE)
# endforeach()
# For Apple set the icns file containing icons
# For Apple set the icns file containing icons
IF
(
APPLE
)
IF
(
APPLE
)
...
@@ -259,6 +280,7 @@ ADD_EXECUTABLE( JPSvis MACOSX_BUNDLE WIN32
...
@@ -259,6 +280,7 @@ ADD_EXECUTABLE( JPSvis MACOSX_BUNDLE WIN32
${
SAMPLE_MOC_HDRS
}
${
SAMPLE_MOC_HDRS
}
${
SAMPLE_UI_HDRS
}
${
SAMPLE_UI_HDRS
}
${
SAMPLE_RESOURCES_RCS
}
${
SAMPLE_RESOURCES_RCS
}
# ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png
# ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png
# JPSvis.icns
# JPSvis.icns
)
)
...
@@ -328,6 +350,7 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
...
@@ -328,6 +350,7 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
message
(
STATUS
"Release flags: "
${
CMAKE_CXX_FLAGS
}
" , "
${
CMAKE_CXX_FLAGS_RELEASE
}
)
message
(
STATUS
"Release flags: "
${
CMAKE_CXX_FLAGS
}
" , "
${
CMAKE_CXX_FLAGS_RELEASE
}
)
endif
(
CMAKE_BUILD_TYPE MATCHES Debug
)
endif
(
CMAKE_BUILD_TYPE MATCHES Debug
)
# PGI ++ Flags
# PGI ++ Flags
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"PGI"
)
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"PGI"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
--c++11 -Minform=inform"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
--c++11 -Minform=inform"
)
...
@@ -399,6 +422,7 @@ IF(APPLE)
...
@@ -399,6 +422,7 @@ IF(APPLE)
# SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png)
# SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png)
SET
(
MACOSX_BUNDLE_ICON_FILE JPSvis.icns
)
SET
(
MACOSX_BUNDLE_ICON_FILE JPSvis.icns
)
SET
(
MACOSX_GUI_ICON JPSvis.icns
)
SET
(
MACOSX_GUI_ICON JPSvis.icns
)
set_target_properties
(
JPSvis PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${
CMAKE_CURRENT_SOURCE_DIR
}
/Resources/Info.plist.in
)
SET
(
MACOSX_BUNDLE_COPYRIGHT
"Copyright (c) 2015 Forschungszentrum Juelich. All rights reserved."
)
SET
(
MACOSX_BUNDLE_COPYRIGHT
"Copyright (c) 2015 Forschungszentrum Juelich. All rights reserved."
)
SET
(
MACOSX_BUNDLE_BUNDLE_NAME
"JPSvis"
)
SET
(
MACOSX_BUNDLE_BUNDLE_NAME
"JPSvis"
)
SET
(
MACOSX_BUNDLE_BUNDLE_VERSION
"
${
JPSVIS_VERSION
}
"
)
SET
(
MACOSX_BUNDLE_BUNDLE_VERSION
"
${
JPSVIS_VERSION
}
"
)
...
@@ -415,5 +439,14 @@ ENDIF(APPLE)
...
@@ -415,5 +439,14 @@ ENDIF(APPLE)
# where CPackConfig.cmake is created by including CPack
# where CPackConfig.cmake is created by including CPack
# And then there's ways to customize this as well
# And then there's ways to customize this as well
set
(
CPACK_BINARY_DRAGNDROP ON
)
set
(
CPACK_BINARY_DRAGNDROP ON
)
set
(
CPACK_PACKAGE_NAME
"jpsvis"
)
set
(
CPACK_PACKAGE_VENDOR
"www.jupedsim.org"
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"MyLib - CPack Component Installation Example"
)
set
(
CPACK_PACKAGE_VERSION
"1.0.0"
)
set
(
CPACK_PACKAGE_VERSION_MAJOR
"1"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"0"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"0"
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"CPack Component Example"
)
include
(
CPack
)
include
(
CPack
)
This diff is collapsed.
Click to expand it.
Resources/Info.plist.in
0 → 100644
+
38
−
0
View file @
21827c33
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist
version=
"1.0"
>
<dict>
<key>
CFBundleDevelopmentRegion
</key>
<string>
English
</string>
<key>
CFBundleExecutable
</key>
<string>
JPSvis
</string>
<key>
CFBundleGetInfoString
</key>
<string></string>
<key>
CFBundleIconFile
</key>
<string>
JPSvis.icns
</string>
<key>
CFBundleIdentifier
</key>
<string>
www.jupedsim.org
</string>
<key>
CFBundleInfoDictionaryVersion
</key>
<string>
6.0
</string>
<key>
CFBundleLongVersionString
</key>
<string>
version 0.7.0
</string>
<key>
CFBundleName
</key>
<string>
JPSvis
</string>
<key>
CFBundlePackageType
</key>
<string>
APPL
</string>
<key>
CFBundleShortVersionString
</key>
<string>
0.7.0
</string>
<key>
CFBundleSignature
</key>
<string>
????
</string>
<key>
CFBundleVersion
</key>
<string>
0.7.0
</string>
<key>
CSResourcesFileMapped
</key>
<true/>
<key>
LSRequiresCarbon
</key>
<true/>
<key>
NSHumanReadableCopyright
</key>
<string>
Copyright (c) 2015 Forschungszentrum Juelich. All rights reserved.
</string>
<key>
NSHighResolutionCapable
</key>
<true/>
</dict>
</plist>
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