Skip to content

344: Make libssh2 optional when building tests #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 3, 2016
Merged

344: Make libssh2 optional when building tests #259

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5af784b
test: Removing libssh2 requirement from build
Feb 19, 2016
9e15b23
Updating libssh2 to v1.7.0 and allowing libssh2 packaging (dependencies)
Feb 25, 2016
ddf6a2c
[ci-skip] Updating documentation around Boost libraries
Feb 25, 2016
9b15c2d
Merge remote-tracking branch 'origin/master' into 344
Mar 1, 2016
4b24252
Updating major/minor/patch to avoid naming conflicts on some platforms
Mar 1, 2016
a36c6da
Updated test option descriptions
Mar 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 41 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ if(POLICY CMP0042)
cmake_policy(SET CMP0042 OLD)
endif()

# Force OLD style of implicitly dereferencing variables
if(POLICY CMP0054)
cmake_policy(SET CMP0054 OLD)
endif()

# Title the project and define the versioning
project(${PROJECT_NAME_STR} C CXX)

Expand Down Expand Up @@ -60,6 +65,8 @@ option(CASS_BUILD_STATIC "Build static library" OFF)
option(CASS_BUILD_EXAMPLES "Build examples" OFF)
option(CASS_BUILD_DOCS "Build documentation" OFF)
option(CASS_BUILD_TESTS "Build tests" OFF)
option(CASS_BUILD_INTEGRATION_TESTS "Build tests" OFF)
option(CASS_BUILD_UNIT_TESTS "Build tests" OFF)
Copy link
Contributor

@mpenick mpenick Mar 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe these should say "Build integration tests" and "Build unit tests"?

Copy link
Contributor Author

@mikefero mikefero Mar 3, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call; that is why you shouldn't copy and paste.

option(CASS_INSTALL_HEADER "Install header file" ON)
option(CASS_MULTICORE_COMPILATION "Enable multicore compilation" OFF)
option(CASS_USE_STATIC_LIBS "Link static libraries when building executables" OFF)
Expand All @@ -69,8 +76,18 @@ option(CASS_USE_OPENSSL "Use OpenSSL" ON)
option(CASS_USE_TCMALLOC "Use tcmalloc" OFF)
option(CASS_USE_SPARSEHASH "Use sparsehash" OFF)
option(CASS_USE_ZLIB "Use zlib" OFF)
option(CASS_USE_LIBSSH2 "Use libssh2 for integration tests" ON)

# Handle testing dependencies
if(CASS_BUILD_TESTS)
# Enable integration and unit tests for backwards compatibility
set(CASS_BUILD_INTEGRATION_TESTS ON)
set(CASS_BUILD_UNIT_TESTS ON)
endif()
if(CASS_BUILD_INTEGRATION_TESTS)
set(CASS_USE_OPENSSL ON) # Required for integration tests
endif()
if(CASS_BUILD_UNIT_TESTS)
set(CASS_BUILD_STATIC ON) # Required for unit tests
endif()

Expand Down Expand Up @@ -142,7 +159,7 @@ set(CASS_LIBS ${CASS_LIBS} ${LIBUV_LIBRARY})
#------------------------

# Boost
if(CASS_USE_BOOST_ATOMIC OR CASS_BUILD_TESTS)
if(CASS_USE_BOOST_ATOMIC OR CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
# Allow for boost directory to be specified on the command line
set(ENV{BOOST_ROOT} "${PROJECT_SOURCE_DIR}/lib/boost/")
if(BOOST_ROOT_DIR)
Expand Down Expand Up @@ -178,7 +195,7 @@ if(CASS_USE_BOOST_ATOMIC OR CASS_BUILD_TESTS)
endif()

# Ensure unit and integration test boost components exist
if(CASS_BUILD_TESTS)
if(CASS_BUILD_UNIT_TESTS OR CASS_BUILD_INTEGRATION_TESTS)
find_package(Boost ${CASS_MINIMUM_BOOST_VERSION} COMPONENTS chrono date_time filesystem log log_setup system regex thread unit_test_framework)
if(NOT Boost_FOUND)
message(FATAL_ERROR "Boost [chrono, date_time, filesystem, log, log_setup, system, regex, thread, and unit_test_framework] are required to build tests")
Expand Down Expand Up @@ -295,21 +312,24 @@ endif()
#--------------------

# libssh2
if(CASS_BUILD_TESTS)
# Setup the root directory for libssh2
set(LIBSSH2_ROOT "${PROJECT_SOURCE_DIR}/lib/libssh2/" $ENV{LIBSSH2_ROOT})
set(LIBSSH2_ROOT ${LIBSSH2_ROOT} ${LIBSSH2_ROOT_DIR} $ENV{LIBSSH2_ROOT_DIR})

# Discover libssh2
find_package(LIBSSH2 REQUIRED)
if(NOT LIBSSH2_FOUND)
message(FATAL_ERROR "libssh2 are required to build tests")
endif()

# Assign test libraries (additional boost and libssh2 dependencies)
set(CASS_TEST_LIBS ${Boost_LIBRARIES} ${LIBSSH2_LIBRARIES})
if(UNIX)
set(CASS_TEST_LIBS ${CASS_TEST_LIBS} pthread)
if(CASS_BUILD_INTEGRATION_TESTS)
if(CASS_USE_LIBSSH2)
# Setup the root directory for libssh2
set(LIBSSH2_ROOT "${PROJECT_SOURCE_DIR}/lib/libssh2/" $ENV{LIBSSH2_ROOT})
set(LIBSSH2_ROOT ${LIBSSH2_ROOT} ${LIBSSH2_ROOT_DIR} $ENV{LIBSSH2_ROOT_DIR})

# Discover libssh2
find_package(LIBSSH2 QUIET)
if(LIBSSH2_FOUND)
# Assign test libraries (additional boost and libssh2 dependencies)
set(CASS_TEST_LIBS ${Boost_LIBRARIES} ${LIBSSH2_LIBRARIES})
if(UNIX)
set(CASS_TEST_LIBS ${CASS_TEST_LIBS} pthread)
endif()
add_definitions(-DCASS_USE_LIBSSH2)
else()
message(STATUS "libssh2 is Unavailable: Building integration tests without libssh2 support")
endif()
endif()
endif()

Expand Down Expand Up @@ -400,8 +420,8 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
string(REPLACE "/INCREMENTAL" "/INCREMENTAL:NO" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")

# Create specific linker flags
set(WINDOWS_LINKER_FLAGS "/INCREMENTAL:NO /LTCG /NODEFAULTLIB:LIBCMT.LIB /NODEFAULTLIB:LIBCMTD.LIB")
if(CASS_USE_STATIC_LIBS)
set(WINDOWS_LINKER_FLAGS "/INCREMENTAL:NO /LTCG /NODEFAULTLIB:LIBCMT.LIB /NODEFAULTLIB:LIBCMTD.LIB")
set(PROJECT_CXX_LINKER_FLAGS "${WINDOWS_LINKER_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${WINDOWS_LINKER_FLAGS}")
endif()
Expand Down Expand Up @@ -631,10 +651,11 @@ set(INSTALL_DLL_EXE_DIR "bin")
#-----------------------------

# Add the unit and integration tests to the build process
if(CASS_BUILD_TESTS)
if(CASS_BUILD_UNIT_TESTS)
# Add the unit test project
add_subdirectory(test/unit_tests)

endif()
if(CASS_BUILD_INTEGRATION_TESTS)
# Add CCM bridge as a dependency for integration tests
add_subdirectory("${PROJECT_SOURCE_DIR}/test/ccm_bridge")
set(CCM_BRIDGE_INCLUDES "${PROJECT_SOURCE_DIR}/test/ccm_bridge/src")
Expand Down
15 changes: 9 additions & 6 deletions test/ccm_bridge/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.6.4)
# Clear INCLUDE_DIRECTORIES to not include project-level includes
set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES)

# Force OLD style of leaving VERSION variables untouched
if(POLICY CMP0048)
cmake_policy(SET CMP0048 OLD)
endif()
Expand Down Expand Up @@ -30,17 +31,19 @@ file(GLOB CCM_BRIDGE_INC_FILES ${PROJECT_SOURCE_DIR}/src/*.hpp)
file(GLOB CCM_BRIDGE_SRC_FILES ${PROJECT_SOURCE_DIR}/src/*.cpp)

# Build up the include paths
set(INTEGRATION_TESTS_INCLUDES ${PROJECT_SOURCE_DIR}/src
${Boost_INCLUDE_DIRS}
${LIBSSH2_INCLUDE_DIRS})
set(INTEGRATION_TESTS_INCLUDES ${PROJECT_SOURCE_DIR}/src ${Boost_INCLUDE_DIRS})
if(LIBSSH2_FOUND)
set(INTEGRATION_TESTS_INCLUDES ${INTEGRATION_TESTS_INCLUDES} ${LIBSSH2_INCLUDE_DIRS})
endif()

# Assign the include directories
include_directories(${INTEGRATION_TESTS_INCLUDES})

# Build up the libraries paths
set(INTEGRATION_TESTS_LIBS ${Boost_LIBRARIES}
${LIBSSH2_LIBRARIES}
${OPENSSL_LIBRARIES})
set(INTEGRATION_TESTS_LIBS ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES})
if(LIBSSH2_FOUND)
set(INTEGRATION_TEST_LIBS ${INTEGRATION_TEST_LIBS} ${LIBSSH2_LIBRARIES})
endif()
if(ZLIB_FOUND)
set(INTEGRATION_TESTS_LIBS ${INTEGRATION_TESTS_LIBS} ${ZLIB_LIBRARIES})
endif()
Expand Down
Loading