diff options
| author | Trygve Laugstøl <trygvis@inamo.no> | 2015-08-04 22:09:04 +0200 |
|---|---|---|
| committer | Trygve Laugstøl <trygvis@inamo.no> | 2015-08-04 22:09:04 +0200 |
| commit | 6e43b92686a9d8bf476567113fbc21677338eb08 (patch) | |
| tree | 0f9804022705b46f322e2d28cbbbc489b0853425 /CMakeLists.txt | |
| parent | cf94e623ff3c3dcdd4ca6a59632d48bd17b75d55 (diff) | |
| download | mqtt-cassandra-bridge-6e43b92686a9d8bf476567113fbc21677338eb08.tar.gz mqtt-cassandra-bridge-6e43b92686a9d8bf476567113fbc21677338eb08.tar.bz2 mqtt-cassandra-bridge-6e43b92686a9d8bf476567113fbc21677338eb08.tar.xz mqtt-cassandra-bridge-6e43b92686a9d8bf476567113fbc21677338eb08.zip | |
o Adding even better --help handling.
Fixing handling of timestamps on 32-bit platforms. Defining a timestamp_t type and useing it all over.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f63f023..95bcf89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.2) -project(soil-moisture) +project(mqtt_cassandra_bridge) find_package(Boost COMPONENTS system program_options unit_test_framework REQUIRED) @@ -14,7 +14,8 @@ ExternalProject_Add(cpp-driver URL https://github.com/datastax/cpp-driver/archive/2.1.0-beta.tar.gz URL_MD5 d3cfde8731acc2f0f51ef9caf41068dc PREFIX ${CPP_DRIVER} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_C_COMPILER:FILE=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:FILE=${CMAKE_CXX_COMPILER} +# PATCH_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/cmake-cassandra.tmp.cmake <SOURCE_DIR>/CMakeLists.txt + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_C_COMPILER:FILE=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:FILE=${CMAKE_CXX_COMPILER} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_LD_FLAGS=${CMAKE_LD_FLAGS} ) # ble-toys @@ -24,7 +25,7 @@ ExternalProject_Add(ble-toys GIT_TAG f6493150c1a7172bcd8c9cc1790829285f707ee9 GIT_SUBMODULES json PREFIX ${BLE_TOYS} - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_C_COMPILER:FILE=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:FILE=${CMAKE_CXX_COMPILER} + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_C_COMPILER:FILE=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER:FILE=${CMAKE_CXX_COMPILER} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_LD_FLAGS=${CMAKE_LD_FLAGS} ) # nghttp2 @@ -34,8 +35,8 @@ ExternalProject_Add(nghttp2 URL_MD5 ff25d732d79128c4fa426393a635c21e PREFIX ${NGHTTP2} BUILD_ALWAYS 0 - CONFIGURE_COMMAND cd <SOURCE_DIR> && autoreconf -i && automake && autoconf && ./configure --prefix=<INSTALL_DIR> --enable-asio-lib - BUILD_COMMAND cd <SOURCE_DIR> && "$(MAKE)" + CONFIGURE_COMMAND cd <SOURCE_DIR> && autoreconf -i && automake && autoconf && ./configure CFLAGS=${CMAKE_C_FLAGS} CXXFLAGS=${CMAKE_CXX_FLAGS} --prefix=<INSTALL_DIR> --enable-asio-lib ${NGHTTP2_CONFIGURE_EXTRA_ARGS} + BUILD_COMMAND cd <SOURCE_DIR> && make INSTALL_COMMAND cd <SOURCE_DIR> && make install ) |