Browse Source

Take control of version numbering

master
C. J. Howard 3 years ago
parent
commit
cd724d5348
3 changed files with 5 additions and 7 deletions
  1. +3
    -5
      CMakeLists.txt
  2. +1
    -1
      modules/antkeeper-data
  3. +1
    -1
      modules/antkeeper-source

+ 3
- 5
CMakeLists.txt View File

@ -5,8 +5,8 @@ endif()
cmake_minimum_required(VERSION 3.7)
# Get software package name and version
include(${CMAKE_SOURCE_DIR}/modules/antkeeper-source/cmake/project.cmake)
# Create superbuild project
project(antkeeper-superbuild VERSION "0.0.1")
# Setup package variables
set(PACKAGE_NAME ${PROJECT_NAME})
@ -35,9 +35,6 @@ else()
endif()
endif()
# Create superbuild project
project(${PACKAGE_NAME}-superbuild VERSION ${PACKAGE_VERSION})
# Options
set(BLENDER "blender" CACHE FILEPATH "Path to Blender executable")
set(INKSCAPE "inkscape" CACHE FILEPATH "Path to Inkscape executable")
@ -146,6 +143,7 @@ ExternalProject_Add(antkeeper-source
"-DCMAKE_INSTALL_PREFIX=${PACKAGE_INSTALL_DIR}"
"-DPACKAGE_PLATFORM=${PACKAGE_PLATFORM}"
"-DCMAKE_PREFIX_PATH=${MODULE_INSTALL_DIR}"
"-DVERSION_STRING=${PROJECT_VERSION}"
BUILD_ALWAYS 1)
# Build antkeeper-data module

+ 1
- 1
modules/antkeeper-data

@ -1 +1 @@
Subproject commit 894d8b2f002d8bdf5dfdd12ba504432d0fd7ba91
Subproject commit 97eb1925143c1547ee46ba548a11a109fa6b95d6

+ 1
- 1
modules/antkeeper-source

@ -1 +1 @@
Subproject commit 5a2d8861130f27d4a5cc87ed1c702d8bc170566a
Subproject commit be531e183382ec355fb653600b0233d52c12d015

Loading…
Cancel
Save