Raise CMake minimum version to 3.16, CMake fixes, update Homepage

CMakeLists.txt

@@ -18,10 +18,10 @@
 #                      The default is ON.
 ################################################
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16)
 
 # Project info
-project(uchmviewer HOMEPAGE_URL "https://github.com/u-235/uchmviewer")
+project(uchmviewer HOMEPAGE_URL "https://github.com/eBookProjects/uChmViewer")
 include(cmake/get-version.cmake)
 
 include(cmake/use-in.cmake)
@@ -47,7 +47,7 @@ find_package(libzip REQUIRED)
 set(APP_QT_MIN_VERSION 5.0)
 set(APP_QT_MODULES Core Network PrintSupport Widgets Xml)
 # Modules for WebKit or WebEngine.
-if (${USE_WEBENGINE})
+if (USE_WEBENGINE)
     set(APP_QT_MIN_VERSION 5.9)
     list(APPEND APP_QT_MODULES WebEngineWidgets)
     target_link_libraries(extra INTERFACE Qt::WebEngineWidgets)
@@ -71,18 +71,18 @@ endif ()
 
 set(QT Qt${QT_VERSION_MAJOR})
 # Since Qt 6 QTextCodec moved in the Qt 5 Core Compat module.
-if (${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+if (QT_VERSION_MAJOR GREATER_EQUAL 6)
     list(APPEND APP_QT_MODULES Core5Compat)
     target_link_libraries(extra INTERFACE ${QT}::Core5Compat)
 endif ()
 
-if (${USE_DBUS})
+if (USE_DBUS)
     list(APPEND APP_QT_MODULES DBus)
     target_link_libraries(extra INTERFACE Qt::DBus)
     target_compile_definitions(extra INTERFACE USE_DBUS)
 endif ()
 
-if (${USE_MAC_APP})
+if (USE_MAC_APP)
     target_compile_definitions(extra INTERFACE USE_MAC_APP)
 endif ()
 

CONTRIBUTING.md

@@ -9,9 +9,9 @@ Have you found a bug?
 ---------------------
 
 * Ensure the bug was not already reported in the
-  [issues](https://github.com/u-235/uchmviewer/issues?q=type%3Aissue).
+  [issues](https://github.com/eBookProjects/uChmViewer/issues?q=type%3Aissue).
 * If you have not found an open issue that solves the problem, open
-  a [new one](https://github.com/u-235/uchmviewer/issues/new). Be sure
+  a [new one](https://github.com/eBookProjects/uChmViewer/issues/new). Be sure
   to include a title and a clear description with information to help
   reproduce the bug. Useful information may be:
 

README.md

@@ -24,7 +24,7 @@ KchmViewer is written by [Georgy Yunaev](https://github.com/gyunaev), and is lic
 
 Fixed a bug causing false detection of an external link and displaying the “Open link in external program” dialog box.
 
-Read more in the [release note](https://github.com/u-235/uchmviewer/releases/latest) and in the [news](NEWS.md).
+Read more in the [release note](https://github.com/eBookProjects/uChmViewer/releases/latest) and in the [news](NEWS.md).
 
 
 ## Features

lib/CMakeLists.txt

@@ -1,8 +1,8 @@
 
-if (${USE_STATIC_CHMLIB})
+if (USE_STATIC_CHMLIB)
     set(CHMLIB_SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/CHMLib/src)
 
-    if (EXISTS ${CHMLIB_SRC_DIR}/chm_lib.h)
+    if (EXISTS "${CHMLIB_SRC_DIR}/chm_lib.h")
         add_library(chmlib STATIC
             ${CHMLIB_SRC_DIR}/chm_lib.c
             ${CHMLIB_SRC_DIR}/chm_lib.h

packages/CMakeLists.txt

@@ -1,7 +1,7 @@
 
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.16)
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     install(FILES freedesktop/uchmviewer.desktop DESTINATION ${APP_DEF_INSTALL_DIR})
     install(DIRECTORY freedesktop/icons/ DESTINATION ${APP_ICONS_INSTALL_DIR})
 elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND USE_MACOS_BUNDLE)
@@ -26,7 +26,7 @@ if (USE_DEPLOY_RUNTIME)
         install(FILES $<TARGET_FILE:chm> DESTINATION ${APP_BIN_INSTALL_DIR})
     endif ()
 
-    if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+    if (CMAKE_SYSTEM_NAME MATCHES "Windows")
         # Copying runtime dependencies for Windows deployment
         # See https://doc.qt.io/qt-5/windows-deployment.html
         set(QT_DEPLOY_DIR ${CMAKE_CURRENT_BINARY_DIR}/qt-deploy)

po/CMakeLists.txt

@@ -36,7 +36,7 @@ endif ()
 if (USE_GETTEXT)
     foreach (LANG ${LANGUAGES})
         set(CATALOG ${CMAKE_CURRENT_SOURCE_DIR}/${CATALOG_NAME}_${LANG}.po)
-        if(EXISTS ${CATALOG})
+        if(EXISTS "${CATALOG}")
             file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${LANG}/LC_MESSAGES)
             set(GMO_FILE ${CMAKE_CURRENT_BINARY_DIR}/${LANG}/LC_MESSAGES/${CATALOG_NAME}.mo)
             list(APPEND GMO_LIST ${GMO_FILE})

src/CMakeLists.txt

@@ -75,7 +75,7 @@ set(UIS
     window_browser.ui
     )
 
-if (${USE_WEBENGINE})
+if (USE_WEBENGINE)
     list(APPEND CPP_SOURCES
         qtwebengine/viewwindow.cpp
         qtwebengine/viewwindow.h
@@ -93,13 +93,13 @@ else ()
     list(APPEND MOC_HEADERS qtwebkit/viewwindow.h)
 endif ()
 
-if (${USE_DBUS})
+if (USE_DBUS)
     list(APPEND CPP_SOURCES dbus_interface.cpp dbus_interface.h)
     list(APPEND MOC_HEADERS dbus_interface.h)
 endif ()
 
 # Mac OS specific
-if (${USE_MAC_APP})
+if (USE_MAC_APP)
     list(APPEND CPP_SOURCES uchmviewerapp.cpp uchmviewerapp.h)
     list(APPEND MOC_HEADERS uchmviewerapp.h)
 endif ()