From 21827c33746c995311b068a4d9ddf329bf030522 Mon Sep 17 00:00:00 2001
From: Mohcine Chraibi <m.chraibi@fz-juelich.de>
Date: Tue, 14 Jul 2015 03:07:34 +0200
Subject: [PATCH] JPSvis is Retina Ready :-)
---
CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++
Resources/Info.plist.in | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 71 insertions(+)
create mode 100644 Resources/Info.plist.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d93fc98..222af7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,6 +242,27 @@ elseif( ${QT5_INSTALLED} )
qt5_wrap_ui(SAMPLE_UI_HDRS ${SAMPLE_UIS})
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
IF(APPLE)
@@ -259,6 +280,7 @@ ADD_EXECUTABLE( JPSvis MACOSX_BUNDLE WIN32
${SAMPLE_MOC_HDRS}
${SAMPLE_UI_HDRS}
${SAMPLE_RESOURCES_RCS}
+
# ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png
# JPSvis.icns
)
@@ -328,6 +350,7 @@ else(CMAKE_BUILD_TYPE MATCHES Debug)
message(STATUS "Release flags: " ${CMAKE_CXX_FLAGS} " , " ${CMAKE_CXX_FLAGS_RELEASE} )
endif(CMAKE_BUILD_TYPE MATCHES Debug)
+
# PGI ++ Flags
if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "PGI")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --c++11 -Minform=inform")
@@ -399,6 +422,7 @@ IF(APPLE)
# SET(MACOSX_BUNDLE_ICON_FILE ${CMAKE_CURRENT_SOURCE_DIR}/forms/icons/JPSvis.png)
SET(MACOSX_BUNDLE_ICON_FILE 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_BUNDLE_NAME "JPSvis")
SET(MACOSX_BUNDLE_BUNDLE_VERSION "${JPSVIS_VERSION}")
@@ -415,5 +439,14 @@ ENDIF(APPLE)
# where CPackConfig.cmake is created by including CPack
# And then there's ways to customize this as well
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)
diff --git a/Resources/Info.plist.in b/Resources/Info.plist.in
new file mode 100644
index 0000000..92c0c27
--- /dev/null
+++ b/Resources/Info.plist.in
@@ -0,0 +1,38 @@
+<?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>
--
GitLab