diff --git a/CMakeLists.txt b/CMakeLists.txt index 486a9f9e6..8aec2e99d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(PROJECT_NAME_STR cassandra) set(PROJECT_LIB_NAME ${PROJECT_NAME_STR}) @@ -17,14 +17,13 @@ option(CASS_BUILD_EXAMPLES "Build examples" ON) set(PROJECT_VERSION_MAJOR 1) set(PROJECT_VERSION_MINOR 0) set(PROJECT_VERSION_PATCH 0) -set(PROJECT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.beta3) +set(PROJECT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.beta4) # TODO(mstump) add version header # Build up the include paths set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include) set(INCLUDES ${INCLUDES} ${PROJECT_INCLUDE_DIR}) -set(INCLUDES ${INCLUDES} "${PROJECT_SOURCE_DIR}/src/third_party/boost") #------------------- # Dependencies @@ -183,6 +182,9 @@ if(CASS_BUILD_STATIC) add_library(${PROJECT_LIB_NAME_STATIC} STATIC ${ALL_SOURCE_FILES}) endif() +target_include_directories(${PROJECT_LIB_NAME} PUBLIC "${PROJECT_SOURCE_DIR}/src/third_party/boost") +target_include_directories(${PROJECT_LIB_NAME_STATIC} PUBLIC "${PROJECT_SOURCE_DIR}/src/third_party/boost") + target_link_libraries(${PROJECT_LIB_NAME} ${LIBS}) if(CASS_BUILD_STATIC) target_link_libraries(${PROJECT_LIB_NAME_STATIC} ${LIBS}) diff --git a/examples/async/CMakeLists.txt b/examples/async/CMakeLists.txt index b12c66df4..78e0bc2ba 100644 --- a/examples/async/CMakeLists.txt +++ b/examples/async/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME async) diff --git a/examples/basic/CMakeLists.txt b/examples/basic/CMakeLists.txt index 8bee59ec1..feb334c8f 100644 --- a/examples/basic/CMakeLists.txt +++ b/examples/basic/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME basic) diff --git a/examples/batch/CMakeLists.txt b/examples/batch/CMakeLists.txt index c900a6c23..9cb5c530e 100644 --- a/examples/batch/CMakeLists.txt +++ b/examples/batch/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME batch) diff --git a/examples/bind_by_name/CMakeLists.txt b/examples/bind_by_name/CMakeLists.txt index 87a54d2e7..dd06f2f3f 100644 --- a/examples/bind_by_name/CMakeLists.txt +++ b/examples/bind_by_name/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME bind_by_name) diff --git a/examples/callbacks/CMakeLists.txt b/examples/callbacks/CMakeLists.txt index 1b1f8cc96..925032c39 100644 --- a/examples/callbacks/CMakeLists.txt +++ b/examples/callbacks/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME callbacks) diff --git a/examples/collections/CMakeLists.txt b/examples/collections/CMakeLists.txt index d577f53b3..a703848bb 100644 --- a/examples/collections/CMakeLists.txt +++ b/examples/collections/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME collections) diff --git a/examples/maps/CMakeLists.txt b/examples/maps/CMakeLists.txt index 1e0ae855c..8805514bf 100644 --- a/examples/maps/CMakeLists.txt +++ b/examples/maps/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME maps) diff --git a/examples/paging/CMakeLists.txt b/examples/paging/CMakeLists.txt index ab2cc6d52..d34216c6b 100644 --- a/examples/paging/CMakeLists.txt +++ b/examples/paging/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME paging) diff --git a/examples/perf/CMakeLists.txt b/examples/perf/CMakeLists.txt index 6360fcdb8..15b861b57 100644 --- a/examples/perf/CMakeLists.txt +++ b/examples/perf/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME perf) diff --git a/examples/prepared/CMakeLists.txt b/examples/prepared/CMakeLists.txt index 0a159deec..0d89042e9 100644 --- a/examples/prepared/CMakeLists.txt +++ b/examples/prepared/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME prepared) diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt index 75efdeafe..58af298df 100644 --- a/examples/simple/CMakeLists.txt +++ b/examples/simple/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME simple) diff --git a/examples/uuids/CMakeLists.txt b/examples/uuids/CMakeLists.txt index 074c7c46a..6502756fd 100644 --- a/examples/uuids/CMakeLists.txt +++ b/examples/uuids/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ".") set(PROJECT_EXAMPLE_NAME uuids) diff --git a/test/ccm_bridge/CMakeLists.txt b/test/ccm_bridge/CMakeLists.txt index a66c59c59..6f14b61d6 100644 --- a/test/ccm_bridge/CMakeLists.txt +++ b/test/ccm_bridge/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) project(CCMBridge C CXX) diff --git a/test/integration_tests/CMakeLists.txt b/test/integration_tests/CMakeLists.txt index 0172796af..4d0e67f4f 100644 --- a/test/integration_tests/CMakeLists.txt +++ b/test/integration_tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) find_package(Boost 1.55.0 COMPONENTS system chrono thread unit_test_framework date_time program_options REQUIRED) diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index 72110149f..cff571a6d 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 2.8.11) find_package(Boost 1.55.0 COMPONENTS system chrono thread unit_test_framework date_time program_options REQUIRED)