Commit 84999261 authored by Michael Ott's avatar Michael Ott
Browse files

Fix cpp-driver version to 1.0.0 release tag

parent aa1bdc77
......@@ -10,7 +10,7 @@ BOOST_VERSION = 1.57.0
SNMP_VERSION = 5.7.2.1
OPENSSL_VERSION = 1.0.1k
LIBEVENT_VERSION = 2.0.21-stable
CPPDRV_VERSION = 1.0
CPPDRV_VERSION = 1.0.0
LIBUV_VERSION = 0.10.32
BOOST_VERSION_U = $(subst .,_,$(BOOST_VERSION))
......@@ -23,7 +23,7 @@ DISTFILES = thrift-$(THRIFT_VERSION).tar.gz;https://dist.apache.org/repos/dist/r
net-snmp-$(SNMP_VERSION).zip;http://netcologne.dl.sourceforge.net/project/net-snmp/net-snmp/$(SNMP_VERSION)/net-snmp-$(SNMP_VERSION).zip \
openssl-$(OPENSSL_VERSION).tar.gz;https://www.openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz \
libevent-$(LIBEVENT_VERSION).tar.gz;https://cloud.github.com/downloads/libevent/libevent/libevent-$(LIBEVENT_VERSION).tar.gz \
cpp-driver-$(CPPDRV_VERSION).zip;https://github.com/datastax/cpp-driver/archive/$(CPPDRV_VERSION).zip \
cpp-driver-$(CPPDRV_VERSION).tar.gz;https://github.com/datastax/cpp-driver/archive/1.0.0.tar.gz \
libuv-v$(LIBUV_VERSION).tar.gz;http://www.libuv.org/dist/v$(LIBUV_VERSION)/libuv-v$(LIBUV_VERSION).tar.gz
FETCH = wget -c --no-check-certificate -O -
......
--- a/CMakeLists.txt 2015-02-06 14:55:56.437712699 +0100
+++ b/CMakeLists.txt 2015-02-06 14:56:45.850837955 +0100
@@ -297,16 +297,7 @@
install(FILES ${INC_FILES} DESTINATION "${INSTALL_HEADERS_DIR}")
endif()
-# Where to put libraries - either lib or lib64.
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if("${LIB64}" STREQUAL "TRUE" AND "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
- set(LIBSUFFIX 64)
-else()
- set(LIBSUFFIX "")
-endif()
-
-set(INSTALL_LIB_DIR "lib${LIBSUFFIX}")
+set(INSTALL_LIB_DIR "lib")
# For windows only
set(INSTALL_DLL_DIR "bin")
--- old/CMakeLists.txt 2015-01-14 12:25:59.000000000 +0100
+++ new/CMakeLists.txt 2015-01-14 12:26:27.000000000 +0100
@@ -288,14 +288,7 @@
endif()
# Where to put libraries - either lib or lib64.
-get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
-
-if("${LIB64}" STREQUAL "TRUE")
- set(LIBSUFFIX 64)
-else()
- set(LIBSUFFIX "")
-endif()
-
+set(LIBSUFFIX "")
set(INSTALL_LIB_DIR "lib${LIBSUFFIX}")
# For windows only
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment