From 96b1561ba104d0d370370f1e2370132ff8050a08 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Thu, 18 Feb 2016 12:14:31 +0000 Subject: [PATCH 1/3] version bump to 1.0.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d8e0c7..02fa471 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) set(CMAKE_BUILD_TYPE Release) -set(mstch_VERSION 1.0.1) +set(mstch_VERSION 1.0.2) if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -O3") From 827b6123ab47d16f2f7538a65d7ef5b6d3449609 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Thu, 18 Feb 2016 12:13:58 +0000 Subject: [PATCH 2/3] Allow shared libraries to be built --- CMakeLists.txt | 7 +++++++ src/CMakeLists.txt | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02fa471..ca6e020 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,13 @@ set(CMAKE_BUILD_TYPE Release) set(mstch_VERSION 1.0.2) +string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" mstch_VERSION_MATCH "${mstch_VERSION}") +set(mstch_VERSION_MAJOR "${CMAKE_MATCH_1}") +set(mstch_VERSION_MINOR "${CMAKE_MATCH_2}") +set(mstch_VERSION_PATCH "${CMAKE_MATCH_3}") +set(mstch_SOVERSION "${mstch_VERSION_MAJOR}.${mstch_VERSION_MINOR}") +unset(mstch_VERSION_MATCH) + if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra -O3") endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6517fc4..483f6a2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -22,9 +22,10 @@ set(SRC token.cpp utils.cpp) -add_library(mstch STATIC ${SRC}) +add_library(mstch ${SRC}) set_property(TARGET mstch PROPERTY VERSION ${mstch_VERSION}) +set_property(TARGET mstch PROPERTY SOVERSION ${mstch_SOVERSION}) install( TARGETS mstch EXPORT mstchTargets From bfa71093ce37c7e2f8c6bb2ba5b3f2623500c6a6 Mon Sep 17 00:00:00 2001 From: Matt Clarkson Date: Thu, 18 Feb 2016 12:38:05 +0000 Subject: [PATCH 3/3] Disable building in source folder --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca6e020..922f6b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,8 @@ option(WITH_BENCHMARK "enable building benchmark executable" OFF) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) +set(CMAKE_DISABLE_SOURCE_CHANGES ON) +set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) set(CMAKE_BUILD_TYPE Release) set(mstch_VERSION 1.0.2)