Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed version info for cmake

This commit is contained in:
Frank Celler 2014-12-24 10:59:33 +01:00
parent 2d92e15497
commit 06e09f607e
4 changed files with 52 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -468,14 +468,14 @@ endif ()
### @brief LIBEV ### @brief LIBEV
################################################################################ ################################################################################
set(LIBEV_VERSION "unknown" CACHE string "LIBEV version")
if (MSVC OR (BUILD_PACKAGE STREQUAL "raspbian")) if (MSVC OR (BUILD_PACKAGE STREQUAL "raspbian"))
set(LIBEV_LIBS ev CACHE string "LIBEV libraries") set(LIBEV_LIBS ev CACHE string "LIBEV libraries")
set(LIBEV_VERSION "4.11" CACHE string "LIBEV version")
else () else ()
set(LIBEV_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/libev CACHE path "LIBEV include path") set(LIBEV_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/libev CACHE path "LIBEV include path")
set(LIBEV_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/libev/BUILD/.libs CACHE path "LIBEV library path") set(LIBEV_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/libev/BUILD/.libs CACHE path "LIBEV library path")
set(LIBEV_LIBS ev CACHE string "LIBEV libraries") set(LIBEV_LIBS ev CACHE string "LIBEV libraries")
set(LIBEV_VERSION "4.11" CACHE string "LIBEV version")
endif () endif ()
if (LIBEV_INCLUDE) if (LIBEV_INCLUDE)
@ -545,7 +545,7 @@ else ()
set(READLINE_INCLUDE "" CACHE path "READLINE include path") set(READLINE_INCLUDE "" CACHE path "READLINE include path")
set(READLINE_LIB_PATH "" CACHE path "READLINE library path") set(READLINE_LIB_PATH "" CACHE path "READLINE library path")
set(READLINE_LIBS readline CACHE string "READLINE libraries") set(READLINE_LIBS readline CACHE string "READLINE libraries")
set(READLINE_VERSION "0x0402.hex" CACHE string "READLINE version") set(READLINE_VERSION "unknown" CACHE string "READLINE version")
endif () endif ()
if (READLINE_INCLUDE) if (READLINE_INCLUDE)
@ -562,7 +562,7 @@ add_definitions("-DTRI_READLINE_VERSION=\"${READLINE_VERSION}\"")
### @brief V8 ### @brief V8
################################################################################ ################################################################################
set(V8_VERSION "3.29.59" CACHE string "V8 version") set(V8_VERSION "unknown" CACHE string "V8 version")
if (MSVC OR (BUILD_PACKAGE STREQUAL "raspbian")) if (MSVC OR (BUILD_PACKAGE STREQUAL "raspbian"))
set(V8_LIBS v8_base;v8_nosnapshot CACHE string "V8 libraries") set(V8_LIBS v8_base;v8_nosnapshot CACHE string "V8 libraries")
@ -586,14 +586,14 @@ add_definitions("-DTRI_V8_VERSION=\"${V8_VERSION}\"")
### @brief ZLIB ### @brief ZLIB
################################################################################ ################################################################################
set(ZLIB_VERSION "unknown" CACHE string "ZLIB version")
if (MSVC OR (BUILD_PACKAGE STREQUAL "raspbian")) if (MSVC OR (BUILD_PACKAGE STREQUAL "raspbian"))
set(ZLIB_LIBS z CACHE string "ZLIB libraries") set(ZLIB_LIBS z CACHE string "ZLIB libraries")
set(ZLIB_VERSION "1.2.7" CACHE string "ZLIB version")
else () else ()
set(ZLIB_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/zlib-1.2.7 CACHE path "ZLIB include path") set(ZLIB_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/zlib-1.2.7 CACHE path "ZLIB include path")
set(ZLIB_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/zlib-1.2.7 CACHE path "ZLIB library path") set(ZLIB_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/zlib-1.2.7 CACHE path "ZLIB library path")
set(ZLIB_LIBS z CACHE string "ZLIB libraries") set(ZLIB_LIBS z CACHE string "ZLIB libraries")
set(ZLIB_VERSION "1.2.7" CACHE string "ZLIB version")
endif () endif ()
if (ZLIB_INCLUDE) if (ZLIB_INCLUDE)

48
GNUmakefile
View File

@ -104,13 +104,17 @@ pack-dmg:
pack-dmg-cmake: pack-dmg-cmake:
cd Build && cmake \ cd Build && cmake \
-D "ARANGODB_VERSION=${VERSION}" \
-D "BUILD_PACKAGE=dmg-cli" \ -D "BUILD_PACKAGE=dmg-cli" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \ -D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "USE_MRUBY=ON" \
-D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \ -D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=${LIBEV_VERSION}" \
-D "READLINE_VERSION=${READLINE_VERSION}" \
-D "USE_MRUBY=ON" \
-D "V8_VERSION=${V8_VERSION}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \
.. ..
${MAKE} .libev-build-64 ${MAKE} .libev-build-64
@ -145,13 +149,17 @@ pack-macosx:
pack-macosx-cmake: pack-macosx-cmake:
cd Build && cmake \ cd Build && cmake \
-D "ARANGODB_VERSION=${VERSION}" \
-D "BUILD_PACKAGE=dmg-cli" \ -D "BUILD_PACKAGE=dmg-cli" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \ -D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "USE_MRUBY=ON" \
-D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \ -D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=${LIBEV_VERSION}" \
-D "READLINE_VERSION=${READLINE_VERSION}" \
-D "USE_MRUBY=ON" \
-D "V8_VERSION=${V8_VERSION}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \
.. ..
${MAKE} .libev-build-64 ${MAKE} .libev-build-64
@ -187,17 +195,21 @@ pack-arm:
pack-arm-cmake: pack-arm-cmake:
cd Build && cmake \ cd Build && cmake \
-D "BUILD_PACKAGE=raspbian" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "ETCDIR=${sysconfdir}" \
-D "VARDIR=${localstatedir}" \
-D "USE_MRUBY=OFF" \
-D "ARANGODB_VERSION=${VERSION}" \ -D "ARANGODB_VERSION=${VERSION}" \
-D "BUILD_PACKAGE=raspbian" \
-D "CMAKE_CXX_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \
-D "CMAKE_C_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \
-D "CMAKE_INSTALL_PREFIX=${prefix}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \ -D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "CMAKE_CXX_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \ -D "ETCDIR=${sysconfdir}" \
-D "CMAKE_C_FLAGS_RELEASE:STRING=-O2 -DNDEBUG" \ -D "LIBEV_VERSION=${LIBEV_VERSION}" \
-D "READLINE_VERSION=${READLINE_VERSION}" \
-D "USE_MRUBY=OFF" \
-D "V8_VERSION=${V8_VERSION}" \
-D "VARDIR=${localstatedir}" \
-D "ZLIB_VERSION=${ZLIB_VERSION}" \
.. ..
${MAKE} ${BUILT_SOURCES} ${MAKE} ${BUILT_SOURCES}
@ -227,17 +239,20 @@ pack-winXX:
pack-winXX-cmake: pack-winXX-cmake:
cd Build$(BITS) && cmake \ cd Build$(BITS) && cmake \
-G "$(TARGET)" \ -G "$(TARGET)" \
-D "USE_MRUBY=OFF" \
-D "ARANGODB_VERSION=${VERSION}" \ -D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \ -D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=4.11" \
-D "USE_MRUBY=OFF" \
-D "V8_VERSION=3.29.59" \
-D "ZLIB_VERSION=1.2.7" \
.. ..
cd Build$(BITS) && cmake --build . --config Release cd Build$(BITS) && cmake --build . --config Release
cd Build$(BITS) && cpack -G NSIS cd Build$(BITS) && cpack -G NSIS
./Installation/Windows/installer-generator.sh $(BITS) $(shell pwd) ./Installation/Windows/installer-generator.sh $(BITS) $(shell pwd)
################################################################################ ################################################################################
@ -260,12 +275,15 @@ pack-vistaXX:
pack-vistaXX-cmake: pack-vistaXX-cmake:
cd Build$(BITS) && cmake \ cd Build$(BITS) && cmake \
-G "$(TARGET)" \ -G "$(TARGET)" \
-D "USE_MRUBY=OFF" \
-D "USE_VISTA_LOCKS=ON" \
-D "ARANGODB_VERSION=${VERSION}" \ -D "ARANGODB_VERSION=${VERSION}" \
-D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \ -D "CPACK_PACKAGE_VERSION_MAJOR=${VERSION_MAJOR}" \
-D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \ -D "CPACK_PACKAGE_VERSION_MINOR=${VERSION_MINOR}" \
-D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \ -D "CPACK_PACKAGE_VERSION_PATCH=${VERSION_PATCH}" \
-D "LIBEV_VERSION=4.11" \
-D "USE_MRUBY=OFF" \
-D "USE_VISTA_LOCKS=ON" \
-D "V8_VERSION=3.29.59" \
-D "ZLIB_VERSION=1.2.7" \
.. ..
cd Build$(BITS) && cmake --build . --config Release cd Build$(BITS) && cmake --build . --config Release

3
configure.ac
View File

@ -252,6 +252,7 @@ if test "x$tr_FREEBSD" == xyes; then
V8_LIBS="$V8_LIBS -lexecinfo" V8_LIBS="$V8_LIBS -lexecinfo"
fi fi
AC_SUBST(V8_VERSION)
AC_SUBST(V8_CPPFLAGS) AC_SUBST(V8_CPPFLAGS)
AC_SUBST(V8_LDFLAGS) AC_SUBST(V8_LDFLAGS)
AC_SUBST(V8_LIBS) AC_SUBST(V8_LIBS)
@ -310,6 +311,7 @@ LIBEV_CPPFLAGS="${LIBEV_CPPFLAGS}"
LIBEV_LDFLAGS="" LIBEV_LDFLAGS=""
LIBEV_LIBS="${srcdir}/3rdParty/libev/BUILD/.libs/libev.a" LIBEV_LIBS="${srcdir}/3rdParty/libev/BUILD/.libs/libev.a"
AC_SUBST(LIBEV_VERSION)
AC_SUBST(LIBEV_CPPFLAGS) AC_SUBST(LIBEV_CPPFLAGS)
AC_SUBST(LIBEV_LDFLAGS) AC_SUBST(LIBEV_LDFLAGS)
AC_SUBST(LIBEV_LIBS) AC_SUBST(LIBEV_LIBS)
@ -333,6 +335,7 @@ ZLIB_CPPFLAGS=""
ZLIB_LDFLAGS="" ZLIB_LDFLAGS=""
ZLIB_LIBS="${srcdir}/3rdParty/zlib-${ZLIB_VERSION}/libz.a" ZLIB_LIBS="${srcdir}/3rdParty/zlib-${ZLIB_VERSION}/libz.a"
AC_SUBST(ZLIB_VERSION)
AC_SUBST(ZLIB_CPPFLAGS) AC_SUBST(ZLIB_CPPFLAGS)
AC_SUBST(ZLIB_LDFLAGS) AC_SUBST(ZLIB_LDFLAGS)
AC_SUBST(ZLIB_LIBS) AC_SUBST(ZLIB_LIBS)

19
m4/external.readline
View File

@ -115,20 +115,20 @@ _ACEOF
AC_MSG_CHECKING([READLINE version]) AC_MSG_CHECKING([READLINE version])
eval "$ac_cpp conftest.$ac_ext" | fgrep "long sdnhg36ed" | awk '{print $4 "." $5}' > conftest.output eval "$ac_cpp conftest.$ac_ext" | fgrep "long sdnhg36ed" | awk '{print $4 "." $5}' > conftest.output
TRI_READLINE_VERSION=`cat conftest.output` READLINE_VERSION=`cat conftest.output`
if test -z "$TRI_READLINE_VERSION"; then if test -z "$READLINE_VERSION"; then
AC_MSG_ERROR([Readline support is not working. Please re-install readline support]) AC_MSG_ERROR([Readline support is not working. Please re-install readline support])
fi fi
AC_MSG_RESULT([$TRI_READLINE_VERSION]) AC_MSG_RESULT([$READLINE_VERSION])
rm -f conftest* rm -f conftest*
elif test "x$tr_READLINE" = xlinenoise; then elif test "x$tr_READLINE" = xlinenoise; then
TRI_READLINE_VERSION="linenoise" READLINE_VERSION="linenoise"
AC_MSG_CHECKING([READLINE version]) AC_MSG_CHECKING([READLINE version])
AC_MSG_RESULT([$TRI_READLINE_VERSION]) AC_MSG_RESULT([$READLINE_VERSION])
fi fi
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
@ -141,10 +141,10 @@ CPPFLAGS="$SAVE_CPPFLAGS"
if test "x$tr_READLINE" = xyes; then if test "x$tr_READLINE" = xyes; then
CPPFLAGS="$CPPFLAGS -DHAVE_READLINE=1" CPPFLAGS="$CPPFLAGS -DHAVE_READLINE=1"
READLINE_CPPFLAGS="${READLINE_CPPFLAGS} -DTRI_READLINE_VERSION='\"${TRI_READLINE_VERSION}\"'" READLINE_CPPFLAGS="${READLINE_CPPFLAGS} -DTRI_READLINE_VERSION='\"${READLINE_VERSION}\"'"
elif test "x$tr_READLINE" = xlinenoise; then elif test "x$tr_READLINE" = xlinenoise; then
READLINE_CPPFLAGS="${READLINE_CPPFLAGS} -DTRI_HAVE_LINENOISE -DTRI_READLINE_VERSION='\"${TRI_READLINE_VERSION}\"'" READLINE_CPPFLAGS="${READLINE_CPPFLAGS} -DTRI_HAVE_LINENOISE -DTRI_READLINE_VERSION='\"${READLINE_VERSION}\"'"
fi fi
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
@ -163,6 +163,7 @@ if test "x$tr_READLINE" = xlinenoise; then
AC_DEFINE_UNQUOTED(TRI_HAVE_LINENOISE, 1, [true if linenoise is used]) AC_DEFINE_UNQUOTED(TRI_HAVE_LINENOISE, 1, [true if linenoise is used])
fi fi
AC_SUBST(READLINE_VERSION)
AC_SUBST(READLINE_CPPFLAGS) AC_SUBST(READLINE_CPPFLAGS)
AC_SUBST(READLINE_LDFLAGS) AC_SUBST(READLINE_LDFLAGS)
AC_SUBST(READLINE_LIBS) AC_SUBST(READLINE_LIBS)
@ -172,14 +173,14 @@ dnl informational output
dnl ---------------------------------------------------------------------------- dnl ----------------------------------------------------------------------------
if test "x$tr_READLINE" = xyes; then if test "x$tr_READLINE" = xyes; then
LIB_INFO="$LIB_INFO|READLINE VERSION: ${TRI_READLINE_VERSION}" LIB_INFO="$LIB_INFO|READLINE VERSION: ${READLINE_VERSION}"
LIB_INFO="$LIB_INFO|READLINE_CPPFLAGS: ${READLINE_CPPFLAGS}" LIB_INFO="$LIB_INFO|READLINE_CPPFLAGS: ${READLINE_CPPFLAGS}"
LIB_INFO="$LIB_INFO|READLINE_LDLIBS: ${READLINE_LDLIBS}" LIB_INFO="$LIB_INFO|READLINE_LDLIBS: ${READLINE_LDLIBS}"
LIB_INFO="$LIB_INFO|READLINE_LIBS: ${READLINE_LIBS}" LIB_INFO="$LIB_INFO|READLINE_LIBS: ${READLINE_LIBS}"
elif test "x$tr_READLINE" = xlinenoise; then elif test "x$tr_READLINE" = xlinenoise; then
LIB_INFO="$LIB_INFO|LINENOISE VERSION: ${TRI_READLINE_VERSION}" LIB_INFO="$LIB_INFO|LINENOISE VERSION: ${READLINE_VERSION}"
LIB_INFO="$LIB_INFO|LINENOISE_CPPFLAGS: ${READLINE_CPPFLAGS}" LIB_INFO="$LIB_INFO|LINENOISE_CPPFLAGS: ${READLINE_CPPFLAGS}"
LIB_INFO="$LIB_INFO|LINENOISE_LDLIBS: ${READLINE_LDLIBS}" LIB_INFO="$LIB_INFO|LINENOISE_LDLIBS: ${READLINE_LDLIBS}"