Removed unnecessary comments in previous commit
This commit is contained in:
parent
721cf6fe4f
commit
84fe5f464c
1 changed files with 21 additions and 21 deletions
|
@ -42,31 +42,31 @@ IF (NOT WIN32 AND NOT APPLE)
|
||||||
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
|
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
|
||||||
ENDIF (NOT WIN32 AND NOT APPLE)
|
ENDIF (NOT WIN32 AND NOT APPLE)
|
||||||
|
|
||||||
#if(APPLE)
|
if(APPLE)
|
||||||
# set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Plugins)
|
set(plugin_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Plugins)
|
||||||
# set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources)
|
set(qtconf_dest_dir ${CMAKE_INSTALL_PREFIX}/oracle.app/Contents/Resources)
|
||||||
|
|
||||||
# note: no codecs in qt5
|
# note: no codecs in qt5
|
||||||
# note: phonon_backend => mediaservice
|
# note: phonon_backend => mediaservice
|
||||||
# note: needs platform on osx
|
# note: needs platform on osx
|
||||||
|
|
||||||
# if (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
# install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
|
install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
|
||||||
# FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
|
FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/.*_debug\\.dylib")
|
||||||
# else()
|
else()
|
||||||
# install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
|
install(DIRECTORY "${QT_PLUGINS_DIR}/" DESTINATION ${plugin_dest_dir} COMPONENT Runtime
|
||||||
# FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/[^_]*\\.dylib")
|
FILES_MATCHING REGEX "(codecs|iconengines|imageformats|mediaservice|phonon_backend|platforms)/[^_]*\\.dylib")
|
||||||
# endif()
|
endif()
|
||||||
|
|
||||||
# install(CODE "
|
install(CODE "
|
||||||
# file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
file(WRITE \"${qtconf_dest_dir}/qt.conf\" \"[Paths]
|
||||||
#Plugins = Plugins\")
|
Plugins = Plugins\")
|
||||||
# " COMPONENT Runtime)
|
" COMPONENT Runtime)
|
||||||
|
|
||||||
# install(CODE "
|
install(CODE "
|
||||||
# file(GLOB_RECURSE QTPLUGINS
|
file(GLOB_RECURSE QTPLUGINS
|
||||||
# \"${plugin_dest_dir}/*.dylib\")
|
\"${plugin_dest_dir}/*.dylib\")
|
||||||
# include(BundleUtilities)
|
include(BundleUtilities)
|
||||||
# fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
|
fixup_bundle(\"${CMAKE_INSTALL_PREFIX}/oracle.app\" \"\${QTPLUGINS}\" \"${QT_LIBRARY_DIR}\")
|
||||||
# " COMPONENT Runtime)
|
" COMPONENT Runtime)
|
||||||
#endif()
|
endif()
|
||||||
|
|
Loading…
Reference in a new issue