Skip to content

Commit

Permalink
update CMake and version files for release on github
Browse files Browse the repository at this point in the history
  • Loading branch information
genscale-admin committed Feb 16, 2016
1 parent de9fe81 commit 346eb30
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 20 deletions.
35 changes: 16 additions & 19 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ cmake_minimum_required (VERSION 2.6)

find_package (JNI REQUIRED)

#set (LIBRARY_OUTPUT_PATH lib/${CMAKE_BUILD_TYPE})
#set (EXECUTABLE_OUTPUT_PATH bin/${CMAKE_BUILD_TYPE})

################################################################################
# The version number.
################################################################################
#
# DO NOT modify these numbers ; only used by Inria team to create official STABLE release
#
set (plast_VERSION_MAJOR 2)
set (plast_VERSION_MINOR 3)
set (plast_VERSION_PATCH 0)
set (plast_VERSION_PATCH "master-unstable")
set (plast-version ${plast_VERSION_MAJOR}.${plast_VERSION_MINOR}.${plast_VERSION_PATCH})
set (plast-date "xxxx-xx-xx")

Expand Down Expand Up @@ -95,30 +95,27 @@ ADD_SUBDIRECTORY(src)
################################################################################
# UNIT TESTS GENERATION
################################################################################
ADD_SUBDIRECTORY(test)
# tests are now done on Inria Jenkins Platform and required additional tests
# data sets only available on that platform.
if (tests)
ADD_SUBDIRECTORY(test)
endif()

################################################################################
# TOOLS GENERATION
################################################################################
ADD_SUBDIRECTORY(tools)

################################################################################
# DOCUMENTATION GENERATION
################################################################################
# call 'make doc-api' to compile doc
ADD_SUBDIRECTORY (doc EXCLUDE_FROM_ALL)

################################################################################
# EXAMPLES GENERATION
################################################################################
# call 'make examples' to compile examples using PLAST c++ API
ADD_SUBDIRECTORY(examples EXCLUDE_FROM_ALL)

################################################################################
# TOOLS GENERATION
################################################################################
ADD_SUBDIRECTORY(tools)

################################################################################
# INSTALLER
################################################################################
#SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY "plast project")
#SET (CPACK_PACKAGE_VENDOR "INRIA/Korilog")
#SET (CPACK_PACKAGE_VERSION_MAJOR "${plast_VERSION_MAJOR}")
#SET (CPACK_PACKAGE_VERSION_MINOR "${plast_VERSION_MINOR}")
#SET (CPACK_PACKAGE_VERSION_PATCH "${plast_VERSION_PATCH}")
#SET (CPACK_PACKAGE_VERSION "${plast-version}")
#include (CPack)
2 changes: 1 addition & 1 deletion src/misc/api/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ namespace misc {
#define PLAST_NAME "plast"

/** Version of the library. */
#define PLAST_VERSION "V2.3.0"
#define PLAST_VERSION "unstable-master"

/** Date of the library. */
#define PLAST_BUILD_DATE "xxxx-xx-xx"
Expand Down

0 comments on commit 346eb30

Please sign in to comment.