CMake buildsystem for src/main as well.

I had to rename PNGs, but updated qmake buildsystem so it still works
(kind of, there are duplicate pngs installed, no big deal...)

Only tested on Linux, but tried to write the cmake code for OSX and
Windows specific things too.

src/CMakeLists.txt

@@ -1,3 +1,3 @@
 add_subdirectory(lib)
-# TODO add_subdirectory(main)
+add_subdirectory(main)
 # TODO add_subdirectory(plugins)

src/install.pri

@@ -25,23 +25,29 @@ mac {
     target3.files = $$PWD/../linux/pixmaps/qupzilla.png
     target3.path = $$icon_folder
 
-    ico16.files = $$PWD/../linux/hicolor/16x16/apps/qupzilla.png
+    ico16.files = $$PWD/../linux/hicolor/16-apps-qupzilla.png
     ico16.path = $$hicolor_folder/16x16/apps
+    ico16.extra = cp $$PWD/../linux/hicolor/16-apps-qupzilla.png $$hicolor_folder/16x16/apps/qupzilla.png
 
-    ico32.files = $$PWD/../linux/hicolor/32x32/apps/qupzilla.png
+    ico32.files = $$PWD/../linux/hicolor/32-apps-qupzilla.png
     ico32.path = $$hicolor_folder/32x32/apps
+    ico32.extra = cp $$PWD/../linux/hicolor/32-apps-qupzilla.png $$hicolor_folder/32x32/apps/qupzilla.png
 
-    ico48.files = $$PWD/../linux/hicolor/48x48/apps/qupzilla.png
+    ico48.files = $$PWD/../linux/hicolor/48-apps-qupzilla.png
     ico48.path = $$hicolor_folder/48x48/apps
+    ico48.extra = cp $$PWD/../linux/hicolor/48-apps-qupzilla.png $$hicolor_folder/48x48/apps/qupzilla.png
 
-    ico64.files = $$PWD/../linux/hicolor/64x64/apps/qupzilla.png
+    ico64.files = $$PWD/../linux/hicolor/64-apps-qupzilla.png
     ico64.path = $$hicolor_folder/64x64/apps
+    ico64.extra = cp $$PWD/../linux/hicolor/64-apps-qupzilla.png $$hicolor_folder/64x64/apps/qupzilla.png
 
-    ico128.files = $$PWD/../linux/hicolor/128x128/apps/qupzilla.png
+    ico128.files = $$PWD/../linux/hicolor/128-apps-qupzilla.png
     ico128.path = $$hicolor_folder/128x128/apps
+    ico128.extra = cp $$PWD/../linux/hicolor/128-apps-qupzilla.png $$hicolor_folder/128x128/apps/qupzilla.png
 
-    ico256.files = $$PWD/../linux/hicolor/256x256/apps/qupzilla.png
+    ico256.files = $$PWD/../linux/hicolor/256-apps-qupzilla.png
     ico256.path = $$hicolor_folder/256x256/apps
+    ico256.extra = cp $$PWD/../linux/hicolor/256-apps-qupzilla.png $$hicolor_folder/256x256/apps/qupzilla.png
 
     bashcompletion.files = $$PWD/../linux/completion/falkon
     bashcompletion.path = $$share_folder/bash-completion/completions

src/main/CMakeLists.txt

@@ -0,0 +1,54 @@
+include_directories(
+  ../lib/3rdparty
+  ../lib/app
+  ../lib/session
+  ../lib/webengine
+  ../lib/webtab
+)
+set(SRCS main.cpp)
+if (WIN32)
+    set(SRCS ${SRCS} appicon.rc)
+endif()
+if (${CMAKE_SYSTEM} MATCHES "OS2")
+    set(SRCS ${SRCS} appicon_os2.rc)
+endif()
+add_executable(falkon ${SRCS})
+
+target_link_libraries(falkon FalkonPrivate)
+
+if (APPLE)
+    set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/main/Info.plist)
+    set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.falkon")
+    set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Falkon")
+    install(FILES lib/data/icons/exeicons/qupzilla.icns DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/locale DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/themes DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/plugins DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+endif ()
+
+if (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR CMAKE_SYSTEM_NAME MATCHES OpenBSD OR HAIKU)
+    target_link_libraries(falkon execinfo)
+endif()
+
+if (UNIX AND NOT APPLE)
+    install(TARGETS falkon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/locale DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/locale) # TODO correct?
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/themes DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/themes)
+
+    install(PROGRAMS ../../linux/applications/org.kde.Falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+
+    install(FILES ../../linux/pixmaps/qupzilla.png DESTINATION ${KDE_INSTALL_DATADIR}/pixmaps)
+
+    ecm_install_icons(ICONS
+        ../../linux/hicolor/16-apps-qupzilla.png
+        ../../linux/hicolor/32-apps-qupzilla.png
+        ../../linux/hicolor/48-apps-qupzilla.png
+        ../../linux/hicolor/64-apps-qupzilla.png
+        ../../linux/hicolor/128-apps-qupzilla.png
+        ../../linux/hicolor/256-apps-qupzilla.png
+        DESTINATION ${KDE_INSTALL_ICONDIR} THEME hicolor)
+
+    install(FILES ../../linux/completion/falkon DESTINATION ${KDE_INSTALL_DATADIR}/bash-completion/completions)
+    install(FILES ../../linux/appdata/org.kde.Falkon.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+endif()
+