Commit 25a43abf by Maarten L. Hekkelman

update version number, fix revision file

parent 46fe0d7c
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
cmake_minimum_required(VERSION 3.16) cmake_minimum_required(VERSION 3.16)
# set the project name # set the project name
project(cifpp VERSION 1.1.1 LANGUAGES CXX) project(cifpp VERSION 2.0.0 LANGUAGES CXX)
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
...@@ -34,6 +34,7 @@ enable_testing() ...@@ -34,6 +34,7 @@ enable_testing()
include(GNUInstallDirs) include(GNUInstallDirs)
include(CheckFunctionExists) include(CheckFunctionExists)
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(CheckIncludeFileCXX)
include(CheckLibraryExists) include(CheckLibraryExists)
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
include(Dart) include(Dart)
...@@ -43,6 +44,12 @@ set(CXX_EXTENSIONS OFF) ...@@ -43,6 +44,12 @@ set(CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
check_include_file_cxx("filesystem" _CXX_FILESYSTEM_HAVE_HEADER)
mark_as_advanced(_CXX_FILESYSTEM_HAVE_HEADER)
if(NOT _CXX_FILESYSTEM_HAVE_HEADER)
message(FATAL_ERROR "The standard c++ header file <filesystem> could not be found, please use a more recent compiler")
endif()
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter")
endif() endif()
...@@ -168,8 +175,6 @@ set(THREADS_PREFER_PTHREAD_FLAG) ...@@ -168,8 +175,6 @@ set(THREADS_PREFER_PTHREAD_FLAG)
find_package(Threads) find_package(Threads)
set (Boost_DETAILED_FAILURE_MSG ON) set (Boost_DETAILED_FAILURE_MSG ON)
# set (Boost_DEBUG ON)
# set (Boost_VERBOSE ON)
find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options) find_package(Boost 1.70.0 REQUIRED COMPONENTS system iostreams regex date_time program_options)
# find_package(ZLIB) # find_package(ZLIB)
...@@ -366,11 +371,11 @@ install(FILES ...@@ -366,11 +371,11 @@ install(FILES
COMPONENT Devel COMPONENT Devel
) )
set(cifpp_MAJOR_VERSION 1) set(cifpp_MAJOR_VERSION ${CMAKE_PROJECT_VERSION_MAJOR})
set_target_properties(cifpp PROPERTIES set_target_properties(cifpp PROPERTIES
VERSION ${PROJECT_VERSION} VERSION ${PROJECT_VERSION}
SOVERSION 1 SOVERSION ${cifpp_MAJOR_VERSION}
INTERFACE_cifpp_MAJOR_VERSION 1) INTERFACE_cifpp_MAJOR_VERSION ${cifpp_MAJOR_VERSION})
set_property(TARGET cifpp APPEND PROPERTY set_property(TARGET cifpp APPEND PROPERTY
COMPATIBLE_INTERFACE_STRING cifpp_MAJOR_VERSION COMPATIBLE_INTERFACE_STRING cifpp_MAJOR_VERSION
......
const char kRevision[] = R"( const char kRevision[] = R"(
libzeep-version: @PROJECT_VERSION@ lib@PROJECT_NAME@-version: @PROJECT_VERSION@
@BUILD_VERSION_STRING@ @BUILD_VERSION_STRING@
Date: @BUILD_DATE_TIME@ Date: @BUILD_DATE_TIME@
)"; )";
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment