Bump major version

This is due to backward incompatible changes in the API.

Also:
* Fix the pc files and include versioning in them.
* Fix cmake warning

Change-Id: If0229cb0e8d54ed57604377ed9386d651eacd5ba

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec9b1147504b8ce6d6cd35783d3af3d945373c5a..779bdb7f8960112cb1195f39fa12abc353a6da43 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 ############################# Check minimum CMake version #####################
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.18)
-PROJECT(${SERVICE_NAME})
+PROJECT(${SERVICE_NAME} VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 ############################# cmake packages ##################################
 
@@ -45,7 +45,7 @@ ENDIF(GCOV_BUILD)
 
 IF(DEFINED NO_FEATURE_CHECK)
     ADD_COMPILE_DEFINITIONS(NO_FEATURE_CHECK)
-ENDIF(NO_FEATURE_CHECK)
+ENDIF(DEFINED NO_FEATURE_CHECK)
 
 IF(NOT DEFINED COVERAGE_DIR)
     SET(COVERAGE_DIR "${SHARE_INSTALL_PREFIX}/${PROJECT_NAME}-coverage")

diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 271f96e1673f173c61b2add686f9ab62ba6d7508..47062b598c62338d7fecffa2929775b147f486fb 100644 (file)
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -16,6 +16,7 @@
 #
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
+CONFIGURE_FILE(${PROJECT_NAME}-hal.pc.in ${PROJECT_NAME}-hal.pc @ONLY)
 
 INSTALL(FILES
     ${CMAKE_BINARY_DIR}/build/${PROJECT_NAME}.pc

diff --git a/build/webauthn-hal.pc b/build/webauthn-hal.pc
deleted file mode 100644 (file)
index dc656fe..0000000
--- a/build/webauthn-hal.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-includedir=${prefix}/include
-
-Name: @PROJECT_NAME@-hal
-Description: HAL API for Authenticator
-Version: @VERSION@
-Requires:
-Cflags: -I${includedir}

diff --git a/build/webauthn-hal.pc.in b/build/webauthn-hal.pc.in
new file mode 100644 (file)
index 0000000..58a5303
--- /dev/null
+++ b/build/webauthn-hal.pc.in
@@ -0,0 +1,8 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+includedir=${prefix}/include
+
+Name: @PROJECT_NAME@-hal
+Description: HAL API for Authenticator
+Version: @CMAKE_PROJECT_VERSION@
+Requires:
+Cflags: -I${includedir}

diff --git a/build/webauthn.pc.in b/build/webauthn.pc.in
index 1008c460b176ad862f9e7f57fbd35c7b7c94a73f..fd7afc6676c39e281a2e53d9edf359824df170a9 100644 (file)
--- a/build/webauthn.pc.in
+++ b/build/webauthn.pc.in
@@ -4,7 +4,7 @@ includedir=${prefix}/include
 
 Name: @PROJECT_NAME@
 Description: Web Authentication API
-Version: @VERSION@
+Version: @CMAKE_PROJECT_VERSION@
 Requires:
 Libs: -L${libdir} -l@PROJECT_NAME@-client -l@PROJECT_NAME@-common
 Cflags: -I${includedir}

diff --git a/packaging/webauthn.spec b/packaging/webauthn.spec
index 4edeba8185a27a38e00f583dde5e18e0a0f3a3ee..b9979248dabbb051f24ee10e8853319cea866922 100644 (file)
--- a/packaging/webauthn.spec
+++ b/packaging/webauthn.spec
@@ -1,6 +1,6 @@
 %{!?build_type:%global build_type RELEASE}
 
-%global version_major   0
+%global version_major   1
 %global version_minor   0
 %global version_patch   1
 %global version_release 1