Permalink
Browse files

Merge pull request #2393 from sanssecours/🏗

CMake: Set Project Description and Homepage URL
  • Loading branch information...
markus2330 committed Feb 11, 2019
2 parents df958ed + 9776fe0 commit 0983c82bfad082c03e438d43841fd96ec87812cb
Showing with 36 additions and 8 deletions.
  1. +24 −6 CMakeLists.txt
  2. +12 −2 doc/news/_preparation_next_release.md
@@ -3,7 +3,30 @@ cmake_minimum_required (VERSION 3.0)
# allows us to override platform specific variables
set (CMAKE_USER_MAKE_RULES_OVERRIDE "${CMAKE_SOURCE_DIR}/cmake/Platform.cmake")

project (Elektra)
set (KDB_VERSION_MAJOR 0)
set (KDB_VERSION_MINOR 8)
set (KDB_VERSION_MICRO 25)
set (KDB_VERSION "${KDB_VERSION_MAJOR}.${KDB_VERSION_MINOR}.${KDB_VERSION_MICRO}")

set (ELEKTRA_DESCRIPTION
"Elektra serves as a universal and secure framework to access configuration settings in a global, hierarchical key database.")
set (ELEKTRA_HOMEPAGE_URL "https://www.libelektra.org")

if (CMAKE_VERSION VERSION_LESS 3.9)
project (Elektra VERSION "${KDB_VERSION}")
elseif (CMAKE_VERSION VERSION_LESS 3.12)
project (Elektra
VERSION ${KDB_VERSION}
DESCRIPTION
${ELEKTRA_DESCRIPTION})
else (CMAKE_VERSION VERSION_LESS 3.12)
project (Elektra
VERSION ${KDB_VERSION}
DESCRIPTION
${ELEKTRA_DESCRIPTION}
HOMEPAGE_URL
${ELEKTRA_HOMEPAGE_URL})
endif (CMAKE_VERSION VERSION_LESS 3.9)

# fix macOS RPATH issues
set (CMAKE_MACOSX_RPATH 1)
@@ -53,11 +76,6 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set (DOMAIN libelektra.org) # needed by doxygen
set (REVERSE_DOMAIN org.libelektra)

set (KDB_VERSION_MAJOR 0)
set (KDB_VERSION_MINOR 8)
set (KDB_VERSION_MICRO 25)

set (KDB_VERSION "${KDB_VERSION_MAJOR}.${KDB_VERSION_MINOR}.${KDB_VERSION_MICRO}")
message (STATUS "You are building Elektra ${KDB_VERSION}")

set (SO_VERSION 4)
@@ -282,15 +282,25 @@ you up to date with the multi-language support provided by Elektra.
### CMake
#### Misc
- The plugin name is now provided as compiler definition `ELEKTRA_PLUGIN_NAME` via CMake.
See [#1042](https://issues.libelektra.org/1042). *(Peter Nirschl)*
- We now specify
- version number,
- project description, and
- homepage URL
in the CMake [`project`](https://cmake.org/cmake/help/latest/command/project.html) command. *(René Schwaiger)*
#### Find Modules
- The CMake find module [`FindAugeas.cmake`](https://master.libelektra.org/cmake/Modules/FindAugeas.cmake) does not print an error
message anymore, if it is unable to locate Augeas in the `pkg-config` search path. *(René Schwaiger)*
- The CMake find module [`FindLua.cmake`](https://master.libelektra.org/cmake/Modules/FindLua.cmake) does not print an error message
anymore, if it is unable to locate a Lua executable. *(René Schwaiger)*
- We added code that makes sure you can compile [IO GLIB](https://www.libelektra.org/bindings/io_glib) on macOS, even if `pkg-config`
erroneously reports that GLIB requires linking to the library `intl` (part of [GNU gettext](https://www.gnu.org/software/gettext)).
*(René Schwaiger)*
- The plugin name is now provided as compiler definition `ELEKTRA_PLUGIN_NAME` via CMake.
See [#1042](https://issues.libelektra.org/1042). *(Peter Nirschl)*
- We added a [CMake find module for GLib](https://master.libelektra.org/cmake/Modules/FindGLib.cmake). The module makes sure you can
compile and link [IO GLib](https://www.libelektra.org/bindings/io_glib) on macOS. *(René Schwaiger)*
- The CMake find module [`FindLibOpenSSL.cmake`](https://master.libelektra.org/cmake/Modules/FindLibOpenSSL.cmake) does not require

0 comments on commit 0983c82

Please sign in to comment.