Skip to content

Minor fixes in CppDriver.cmake #313

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

Closed
wants to merge 2 commits into from
Closed

Minor fixes in CppDriver.cmake #313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9a8473
Remove unused components from find_package(Boost ...)
SeverinLeonhardt Nov 19, 2015
4769c7b
Remove different definition of _WIN32_WINNT
SeverinLeonhardt Nov 19, 2015
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
5 changes: 2 additions & 3 deletions cmake/modules/CppDriver.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ macro(CassUseBoost)

# Determine if Boost components are available for test executables
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)
find_package(Boost ${CASS_MINIMUM_BOOST_VERSION} COMPONENTS chrono system 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")
message(FATAL_ERROR "Boost [chrono, system, thread, and unit_test_framework] are required to build tests")
endif()

# Assign Boost include and libraries
Expand Down Expand Up @@ -375,7 +375,6 @@ macro(CassSetCompilerFlags)
add_definitions(/wd4800) # Performance warning due to automatic compiler casting from int to bool

# Add preprocessor definitions for proper compilation
add_definitions(-D_WIN32_WINNT=0x0501) # Required for winsock (pre Windows XP wspiapi.h only)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Remove warnings for not using safe functions (TODO: Fix codebase to be more secure for Visual Studio)
add_definitions(-DNOMINMAX) # Does not define min/max macros

Expand Down