You didn't see us change the version to 2.0.0 *waves hands mysteriously*

This commit is contained in:
wowzaman12 2015-05-18 02:41:21 +00:00
parent 4116a72ae7
commit 62ce4aa50a
3 changed files with 13 additions and 13 deletions

View File

@ -38,13 +38,13 @@ endif( NOT ENABLE_DEBUGGER AND ENABLE_SDL )
# Set the version number with -DVERSION=X.X.X-uber
IF( NOT VERSION )
SET( VERSION "1.8.0-SVN" )
SET( VERSION "2.0.0-SVN" )
IF(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
FIND_PACKAGE(Subversion)
IF(SUBVERSION_FOUND)
Subversion_WC_INFO(${CMAKE_SOURCE_DIR} SVN_INFO)
SET( VERSION "1.8.0-SVN${SVN_INFO_WC_REVISION}" )
SET( VERSION "2.0.0-SVN${SVN_INFO_WC_REVISION}" )
ENDIF(SUBVERSION_FOUND)
ENDIF(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
ENDIF( NOT VERSION )
@ -119,13 +119,13 @@ if( ENABLE_LINK )
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${RT_LIB})
SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${RT_LIB})
ENDIF(RT_LIB)
FIND_LIBRARY(PTHREAD_LIB pthread)
IF(PTHREAD_LIB)
SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${PTHREAD_LIB})
SET(VBAMCORE_LIBS ${VBAMCORE_LIBS} ${PTHREAD_LIB})
ENDIF(PTHREAD_LIB)
INCLUDE(CheckFunctionExists)
CHECK_FUNCTION_EXISTS(sem_timedwait SEM_TIMEDWAIT)
IF( SEM_TIMEDWAIT)
@ -385,7 +385,7 @@ IF( UNIX )
ENDIF( UNIX )
SET(CPACK_GENERATOR "ZIP")
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
SET(CPACK_PACKAGE_VERSION_PATCH "0-SVN1292")
SET(CPACK_PACKAGE_VERSION_MAJOR "2")
SET(CPACK_PACKAGE_VERSION_MINOR "0")
SET(CPACK_PACKAGE_VERSION_PATCH "0-SVN")
INCLUDE(CPack)

View File

@ -22,8 +22,8 @@
#include "version.h"
//change the FALSE to TRUE for autoincrement of build number
#define INCREMENT_VERSION FALSE
#define FILEVER 1,8,0,600
#define PRODUCTVER 1,8,0,600
#define STRFILEVER "1, 8, 0, 600\0"
#define STRPRODUCTVER "1, 8, 0, 600\0"
#define FILEVER 2,0,0,600
#define PRODUCTVER 2,0,0,600
#define STRFILEVER "2, 0, 0, 600\0"
#define STRPRODUCTVER "2, 0, 0, 600\0"
#endif //__AUTOBUILD_H__

View File

@ -52,6 +52,6 @@
#define VBA_COMPILER_DETAIL ""
#endif
#define VBA_VERSION_STRING " " "1.8.0" VBA_SUBVERSION_STRING VBA_FEATURE_STRING VBA_COMPILER
#define VBA_VERSION_STRING " " "2.0.0" VBA_SUBVERSION_STRING VBA_FEATURE_STRING VBA_COMPILER
#define VBA_NAME_AND_VERSION " " VBA_NAME VBA_VERSION_STRING
#define VBA_NAME_AND_SUBVERSION " " VBA_NAME VBA_SUBVERSION_STRING