generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of github.com:ChaiScript/ChaiScript into develop

Browse Source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Jason Turner
2015-03-21 21:04:03 -06:00
parent 98e36ab836 63c243dec8
commit 1113cafca2
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -1,11 +1,16 @@
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1")
cmake_policy(SET CMP0054 NEW)
endif()
IF(BIICODE) IF(BIICODE)
INIT_BIICODE_BLOCK() INIT_BIICODE_BLOCK()
ADD_BIICODE_TARGETS() ADD_BIICODE_TARGETS()
ELSE() ELSE()
# Your regular CMakeLists configuration here # Your regular CMakeLists configuration here
project(chaiscript) project(chaiscript)
# MINGW does not yet support C++11's concurrency features # MINGW does not yet support C++11's concurrency features

2
include/chaiscript/chaiscript_defines.hpp
View File

@@ -45,7 +45,7 @@
namespace chaiscript { namespace chaiscript {
static const int version_major = 5; static const int version_major = 5;
static const int version_minor = 6; static const int version_minor = 7;
static const int version_patch = 0; static const int version_patch = 0;
} }