Peter M. Groen / cxxopts

Commit 320d7a3d1a2a60ccaf9fa8aca8356052eda6168f

Authored by Mario Werner
Committed by jarro2783
1 parent 299750a3

fixed version parsing in the CMake code (#128)

Inline Side-by-side
Showing 1 changed file with 9 additions and 8 deletions
CMakeLists.txt
  View file @320d7a3
... ... @@ -18,20 +18,21 @@
18 18 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19 19 # THE SOFTWARE.
20 20 cmake_minimum_required(VERSION 3.1)
21   -project(cxxopts)
22 21  
23   -enable_testing()
24   -
25   -file(STRINGS "${PROJECT_SOURCE_DIR}/include/cxxopts.hpp" cxxopts_version_defines
26   - REGEX "#define {CXXOPTS__VERSION_(MAJOR|MINOR|PATCH)")
  22 +# parse the current version from the cxxopts header
  23 +file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/include/cxxopts.hpp" cxxopts_version_defines
  24 + REGEX "#define CXXOPTS__VERSION_(MAJOR|MINOR|PATCH)")
27 25 foreach(ver ${cxxopts_version_defines})
28   - if(ver MATCHES "#define {CXXOPTS__VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$")
29   - set({CXXOPTS__VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "")
  26 + if(ver MATCHES "#define CXXOPTS__VERSION_(MAJOR|MINOR|PATCH) +([^ ]+)$")
  27 + set(CXXOPTS__VERSION_${CMAKE_MATCH_1} "${CMAKE_MATCH_2}" CACHE INTERNAL "")
30 28 endif()
31 29 endforeach()
32 30 set(VERSION ${CXXOPTS__VERSION_MAJOR}.${CXXOPTS__VERSION_MINOR}.${CXXOPTS__VERSION_PATCH})
  31 +message(STATUS "cxxopts version ${VERSION}")
33 32  
34   -# set(VERSION "1.2.0")
  33 +project(cxxopts VERSION "${VERSION}")
  34 +
  35 +enable_testing()
35 36  
36 37 option(CXXOPTS_BUILD_EXAMPLES "Set to ON to build examples" ON)
37 38 option(CXXOPTS_BUILD_TESTS "Set to ON to build tests" OFF)
... ...