cmake port: small adjustments and final commit

Author: domcorbex

CMakeLists.txt

@@ -27,38 +27,45 @@ project (xiphos
   VERSION "4.1.0"
   LANGUAGES C CXX)
 
-# set Xiphos website
+
+# set commonly used Xiphos variables:
+# Xiphos website
 set (XIPHOS_WEBSITE "http://xiphos.org")
-# set Xiphos issues report website
+
+# Xiphos issues report website
 set (XIPHOS_BUG_REPORT "https://github.com/crosswire/xiphos/issues")
-# set Xiphos release date, (we use 'ChangeLog' time value)
-file(TIMESTAMP ${PROJECT_SOURCE_DIR}/ChangeLog
-  XIPHOS_RELEASE_DATE "%b %Y" UTC)
 
+# Xiphos release date, (read from 'ChangeLog')
+# read last entry in ChangeLog
+file(STRINGS ${PROJECT_SOURCE_DIR}/ChangeLog
+  ChangeLog_lastentry REGEX "^20[0-9][0-9]-[0-9][0-9]" LIMIT_COUNT 1)
+# get year
+string(SUBSTRING ${ChangeLog_lastentry} 0 4 ChangeLog_year)
+# get month's number
+string(SUBSTRING ${ChangeLog_lastentry} 5 2 ChangeLog_month)
+# transform month's number into month's name
+list(APPEND month_names "XXX;Jan;Feb;Mar;Apr;May;Jun;Jul;Aug;Sep;Oct;Nov;Dec")
+list(GET month_names ${ChangeLog_month} ChangeLog_month)
+# generate release date string
+string(CONFIGURE "@ChangeLog_month@ @ChangeLog_year@" XIPHOS_RELEASE_DATE)
 
-# tell cmake where its modules can be found in our project directory
-list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
 
 # make sure it's an out-of-stream build
 file(TO_CMAKE_PATH "${PROJECT_BINARY_DIR}/CMakeLists.txt" LOC_PATH)
 if(EXISTS "${LOC_PATH}")
   message(FATAL_ERROR "You cannot build in the source directory (or any directory with a CMakeLists.txt file). Please make an out-of-stream build subdirectory.")
 endif()
 
+
+# tell cmake where its modules can be found in our project directory
+list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+list (APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules)
+
 # set install directory variables as defined by the GNU Coding Standards.
 # e.g. CMAKE_INSTALL_DATAROOTDIR; CMAKE_INSTALL_FULL_BINDIR;
 # CMAKE_INSTALL_FULL_DOCDIR...
 include (GNUInstallDirs)
 
-# cross-compiling for Windows
-if (CMAKE_CROSSCOMPILING AND WIN32)
-  message(STATUS "Cross-Compiling for Windows")
-  # Configure pkg-config for cross-compilation
-  set(ENV{PKG_CONFIG_PATH} ${CMAKE_FIND_ROOT_PATH}/lib/pkgconfig)
-endif(CMAKE_CROSSCOMPILING AND WIN32)
-
-
 # set CMAKE options that the user can optionally select ON or OFF.
 include (XiphosOptions)
 
@@ -82,13 +89,17 @@ add_subdirectory(src/main)
 add_subdirectory(src/webkit)
 add_subdirectory(src/xiphos_html)
 add_subdirectory(src/gtk)
+
+# build xiphos-nav
 add_subdirectory(src/examples)
+
+# build other stuff
 add_subdirectory(pixmaps)
 add_subdirectory(ui)
 add_subdirectory(po)
 add_subdirectory(desktop)
-add_subdirectory(mhelp)
 add_subdirectory(doc)
+add_subdirectory(mhelp)
 
 # create packages
 add_subdirectory(cpack)