Merge pull request #355 from riptano/CPP-878

mikefero · web-flow · commit 4af2425ac52c · 2019-11-22T09:47:43.000-05:00
CPP-878 - Correct compile flags for libraries and executable
diff --git a/cpp-driver/CMakeLists.txt b/cpp-driver/CMakeLists.txt
@@ -151,12 +151,6 @@ if(CASS_BUILD_STATIC)
     set(PC_REQUIRED_LIBS "${PC_REQUIRED_LIBS} openssl")
   endif()
 
-  # Update the test flags to indicate the use of the static library
-  if(CASS_USE_STATIC_LIBS)
-    set(TEST_CXX_FLAGS "${TEST_CXX_FLAGS} -DCASS_STATIC")
-    set(CASS_TEST_CXX_FLAGS "${CASS_TEST_CXX_FLAGS} -DCASS_STATIC")
-  endif()
-
   set_property(TARGET ${PROJECT_LIB_NAME_STATIC} PROPERTY FOLDER "Driver/Cassandra")
 endif()
 
diff --git a/cpp-driver/cmake/modules/CppDriver.cmake b/cpp-driver/cmake/modules/CppDriver.cmake
@@ -147,22 +147,22 @@ macro(CassConfigureShared prefix)
   set_target_properties(${PROJECT_LIB_NAME} PROPERTIES
       COMPILE_PDB_NAME "${PROJECT_LIB_NAME}"
       COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  set(STATIC_COMPILE_FLAGS "-D${prefix}_BUILDING")
+  set(SHARED_COMPILE_FLAGS "-D${prefix}_BUILDING")
   if("${prefix}" STREQUAL "DSE")
-    set(STATIC_COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -DCASS_BUILDING")
+    set(SHARED_COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} -DCASS_BUILDING")
   endif()
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     set_property(
         TARGET ${PROJECT_LIB_NAME}
-        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Wconversion -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
+        APPEND PROPERTY COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} -Wconversion -Wno-sign-conversion -Wno-shorten-64-to-32 -Wno-undefined-var-template -Werror")
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") # To many superfluous warnings generated with GCC when using -Wconversion (see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40752)
     set_property(
         TARGET ${PROJECT_LIB_NAME}
-        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} -Werror")
+        APPEND PROPERTY COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} -Werror")
   elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set_property(
         TARGET ${PROJECT_LIB_NAME}
-        APPEND PROPERTY COMPILE_FLAGS "${STATIC_COMPILE_FLAGS} /we4800")
+        APPEND PROPERTY COMPILE_FLAGS "${SHARED_COMPILE_FLAGS} /we4800")
   endif()
 endmacro()
 
@@ -204,8 +204,8 @@ macro(CassConfigureStatic prefix)
 
   # Update the CXX flags to indicate the use of the static library
   if(${prefix}_USE_STATIC_LIBS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STATIC_COMPILE_FLAGS}")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STATIC_COMPILE_FLAGS}")
+    set(TEST_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STATIC_COMPILE_FLAGS}") # Unit and integration test executables
+    set(EXAMPLE_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${STATIC_COMPILE_FLAGS}") # Example executables
   endif()
 endmacro()
 
diff --git a/cpp-driver/cmake/modules/Gtest.cmake b/cpp-driver/cmake/modules/Gtest.cmake
@@ -288,9 +288,9 @@ macro(GtestUnitTests project_name extra_files extra_includes excluded_test_files
   target_link_libraries(${UNIT_TESTS_NAME}
                         ${DSE_LIBS}
                         ${PROJECT_LIB_NAME_TARGET})
-  set_property(TARGET ${UNIT_TESTS_NAME} PROPERTY PROJECT_LABEL ${UNIT_TESTS_DISPLAY_NAME})
-  set_property(TARGET ${UNIT_TESTS_NAME} PROPERTY FOLDER "Tests")
-  set_property(TARGET ${UNIT_TESTS_NAME} APPEND PROPERTY COMPILE_FLAGS ${TEST_CXX_FLAGS})
+  set_target_properties(${UNIT_TESTS_NAME} PROPERTIES PROJECT_LABEL "${UNIT_TESTS_DISPLAY_NAME}"
+                                                      FOLDER "Tests"
+                                                      COMPILE_FLAGS "${TEST_CMAKE_CXX_FLAGS}")
 
   # Add the unit tests to be executed by ctest (see CMake BUILD_TESTING)
   add_test(${UNIT_TESTS_DISPLAY_NAME} ${UNIT_TESTS_NAME}
diff --git a/cpp-driver/examples/async/CMakeLists.txt b/cpp-driver/examples/async/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/auth/CMakeLists.txt b/cpp-driver/examples/auth/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/basic/CMakeLists.txt b/cpp-driver/examples/basic/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/batch/CMakeLists.txt b/cpp-driver/examples/batch/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/bind_by_name/CMakeLists.txt b/cpp-driver/examples/bind_by_name/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/callbacks/CMakeLists.txt b/cpp-driver/examples/callbacks/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/cloud/CMakeLists.txt b/cpp-driver/examples/cloud/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/collections/CMakeLists.txt b/cpp-driver/examples/collections/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/concurrent_executions/CMakeLists.txt b/cpp-driver/examples/concurrent_executions/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/date_time/CMakeLists.txt b/cpp-driver/examples/date_time/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/duration/CMakeLists.txt b/cpp-driver/examples/duration/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/execution_profiles/CMakeLists.txt b/cpp-driver/examples/execution_profiles/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/host_listener/CMakeLists.txt b/cpp-driver/examples/host_listener/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/logging/CMakeLists.txt b/cpp-driver/examples/logging/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/maps/CMakeLists.txt b/cpp-driver/examples/maps/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/named_parameters/CMakeLists.txt b/cpp-driver/examples/named_parameters/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/paging/CMakeLists.txt b/cpp-driver/examples/paging/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/perf/CMakeLists.txt b/cpp-driver/examples/perf/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/prepared/CMakeLists.txt b/cpp-driver/examples/prepared/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/schema_meta/CMakeLists.txt b/cpp-driver/examples/schema_meta/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/simple/CMakeLists.txt b/cpp-driver/examples/simple/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/ssl/CMakeLists.txt b/cpp-driver/examples/ssl/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/tracing/CMakeLists.txt b/cpp-driver/examples/tracing/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/tuple/CMakeLists.txt b/cpp-driver/examples/tuple/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/udt/CMakeLists.txt b/cpp-driver/examples/udt/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/examples/uuids/CMakeLists.txt b/cpp-driver/examples/uuids/CMakeLists.txt
@@ -9,4 +9,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${CASS_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/cpp-driver/tests/CMakeLists.txt b/cpp-driver/tests/CMakeLists.txt
@@ -69,12 +69,13 @@ if(CASS_BUILD_INTEGRATION_TESTS)
     ${CASS_LIBS}
     ${PROJECT_LIB_NAME_TARGET}
     ${INTEGRATION_TESTS_LIBSSH2_LIBRARIES})
-  set_property(TARGET ${INTEGRATION_TESTS_NAME} PROPERTY PROJECT_LABEL ${INTEGRATION_TESTS_DISPLAY_NAME})
-  set_property(TARGET ${INTEGRATION_TESTS_NAME} PROPERTY FOLDER "Tests")
   # Enable bigobj for large object files during compilation (Cassandra types integration test)
   if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-    set_property(TARGET ${INTEGRATION_TESTS_NAME} APPEND PROPERTY COMPILE_FLAGS "/bigobj")
+    set(TEST_CMAKE_CXX_FLAGS "${TEST_CMAKE_CXX_FLAGS} /bigobj")
   endif()
+  set_target_properties(${INTEGRATION_TESTS_NAME} PROPERTIES PROJECT_LABEL "${INTEGRATION_TESTS_DISPLAY_NAME}"
+                                                             FOLDER "Tests"
+                                                             COMPILE_FLAGS "${TEST_CMAKE_CXX_FLAGS}")
   if(LIBSSH2_LIBRARY_NAME) # Handle ExternalProject dependency
     add_dependencies(${INTEGRATION_TESTS_NAME} ${LIBSSH2_LIBRARY_NAME})
   endif()
diff --git a/examples/date_range/CMakeLists.txt b/examples/date_range/CMakeLists.txt
@@ -15,4 +15,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${DSE_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/examples/geotypes/CMakeLists.txt b/examples/geotypes/CMakeLists.txt
@@ -15,4 +15,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${DSE_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/examples/graph/CMakeLists.txt b/examples/graph/CMakeLists.txt
@@ -15,4 +15,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${DSE_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/examples/gssapi/CMakeLists.txt b/examples/gssapi/CMakeLists.txt
@@ -16,7 +16,8 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${DSE_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
 
 # Set up rules/commands for building gssapi_proxy example
 set(PROJECT_EXAMPLE_NAME gssapi_proxy)
@@ -25,4 +26,5 @@ add_executable(${PROJECT_EXAMPLE_NAME} ${EXAMPLE_SRC_FILES})
 target_link_libraries(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET} ${DSE_LIBS})
 add_dependencies(${PROJECT_EXAMPLE_NAME} ${PROJECT_LIB_NAME_TARGET})
 
-set_property(TARGET ${PROJECT_EXAMPLE_NAME} PROPERTY FOLDER "Examples")
+set_target_properties(${PROJECT_EXAMPLE_NAME} PROPERTIES FOLDER "Examples"
+                                                         COMPILE_FLAGS "${EXAMPLE_CMAKE_C_FLAGS}")
diff --git a/examples/plaintext/CMakeLists.txt b/examples/plaintext/CMakeLists.txt
diff --git a/examples/proxy_execution/CMakeLists.txt b/examples/proxy_execution/CMakeLists.txt
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
