Skip to content

Commit 65b948e

Browse files
committed
bump minor version due to API/ABI change, update pkg-config file
1 parent 5368a47 commit 65b948e

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,9 @@ add_subdirectory(src)
145145

146146
set(pkg_conf_file_in "${CMAKE_CURRENT_SOURCE_DIR}/fcl.pc.in")
147147
set(pkg_conf_file_out "${CMAKE_CURRENT_BINARY_DIR}/fcl.pc")
148+
if(NOT MSVC)
149+
set(PKG_CFLAGS "-std=c++11")
150+
endif()
148151
configure_file("${pkg_conf_file_in}" "${pkg_conf_file_out}" @ONLY)
149152

150153
install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}

CMakeModules/FCLVersion.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# set the version in a way CMake can use
22
set(FCL_MAJOR_VERSION 0)
3-
set(FCL_MINOR_VERSION 4)
3+
set(FCL_MINOR_VERSION 5)
44
set(FCL_PATCH_VERSION 0)
55
set(FCL_VERSION "${FCL_MAJOR_VERSION}.${FCL_MINOR_VERSION}.${FCL_PATCH_VERSION}")
66

77
# increment this when we have ABI changes
8-
set(FCL_ABI_VERSION 6)
8+
set(FCL_ABI_VERSION 7)

fcl.pc.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Description: @PKG_DESC@
99
Version: @FCL_VERSION@
1010
Requires: @PKG_EXTERNAL_DEPS@
1111
Libs: -L${libdir} -lfcl
12-
Cflags: -I${includedir}
12+
Cflags: @PKG_CFLAGS@ -I${includedir}

0 commit comments

Comments
 (0)