Merge pull request #5 from datastax/1.0.0-eap1_build_prep

1.0.0-eap1 release prep

Author: mpenick

.gitignore

@@ -1 +1,2 @@
 build
+docs

CMakeLists.txt

@@ -17,17 +17,33 @@
 cmake_minimum_required(VERSION 2.6.4)
 set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
-
 set(PROJECT_NAME_STRING dse)
 set(PROJECT_LIB_NAME ${PROJECT_NAME_STRING})
 set(PROJECT_LIB_NAME_STATIC "${PROJECT_LIB_NAME}_static")
 
-if(POLICY CMP0042)
-  cmake_policy(SET CMP0042 OLD)
+project(${PROJECT_NAME_STRING} C CXX)
+
+set(CASS_SOURCE_DIR "${PROJECT_SOURCE_DIR}/cpp-driver")
+set(CPP_DRIVER_INCLUDE_DIR "${CASS_SOURCE_DIR}/include")
+set(CPP_DRIVER_SOURCE_DIR "${CASS_SOURCE_DIR}/src")
+set(CPP_DRIVER_THIRD_PARTY_SOURCE_DIR "${CPP_DRIVER_SOURCE_DIR}/third_party")
+set(RAPID_JSON_INCLUDE_DIR "${CPP_DRIVER_THIRD_PARTY_SOURCE_DIR}/rapidjson")
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CASS_SOURCE_DIR}/cmake/modules/")
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+
+# Determine if the submodule should be initialized
+if(NOT EXISTS "${CASS_SOURCE_DIR}/CMakeLists.txt")
+    find_package(Git REQUIRED)
+    execute_process(COMMAND git submodule update --init --recursive
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        OUTPUT_QUIET)
 endif()
 
-project(${PROJECT_NAME_STRING} C CXX)
+include(CppDriver)
+
+CassPolicies()
+CassCheckPlatform()
 
 # Title the project and define the versioning
 set(PROJECT_DISPLAY_NAME "DataStax C/C++ DSE Driver")
@@ -58,69 +74,107 @@ message(STATUS "Project version: ${PROJECT_VERSION_STRING}")
 option(DSE_BUILD_SHARED "Build shared library" ON)
 option(DSE_BUILD_STATIC "Build static library" OFF)
 option(DSE_INSTALL_HEADER "Install header file" ON)
+option(DSE_INSTALL_PKG_CONFIG "Install pkg-config file(s)" ON)
 option(DSE_USE_STATIC_LIBS "Link static libraries when building executables" OFF)
 option(DSE_BUILD_EXAMPLES "Build examples" OFF)
 option(DSE_BUILD_INTEGRATION_TESTS "Build the integration tests" OFF)
 option(DSE_BUILD_UNIT_TESTS "Build the unit tests" OFF)
+option(DSE_USE_BOOST_ATOMIC "Use Boost atomics library" OFF)
+option(DSE_USE_STD_ATOMIC "Use C++11 atomics library" OFF)
+option(DSE_USE_OPENSSL "Use OpenSSL" ON)
+option(DSE_USE_TCMALLOC "Use tcmalloc" OFF)
+option(DSE_USE_SPARSEHASH "Use sparsehash" OFF)
+option(DSE_USE_ZLIB "Use zlib" OFF)
+option(DSE_USE_LIBSSH2 "Use libssh2" OFF)
 
-# Build the Cassandra C/C++ driver submodule
-if(DSE_BUILD_STATIC)
-  set(CASS_BUILD_STATIC ON CACHE BOOL "Build Cassandra driver static library" FORCE)
-endif()
+# Determine which driver target should be used as a dependency
+set(PROJECT_LIB_NAME_TARGET ${PROJECT_LIB_NAME})
 if(DSE_USE_STATIC_LIBS)
-  set(CASS_USE_STATIC_LIBS ON CACHE BOOL "Link static libraries when building Cassandra driver static executables" FORCE)
+  set(DSE_BUILD_STATIC ON)
+  set(PROJECT_LIB_NAME_TARGET ${PROJECT_LIB_NAME_STATIC})
 endif()
-set(CASS_USE_OPENSSL ON CACHE BOOL "Build with OpenSSL support" FORCE)
-set(CPP_DRIVER_DIR "${PROJECT_SOURCE_DIR}/cpp-driver")
-set(CPP_DRIVER_INCLUDE_DIR "${CPP_DRIVER_DIR}/include")
-set(CPP_DRIVER_SOURCE_DIR "${CPP_DRIVER_DIR}/src")
-set(CPP_DRIVER_THIRD_PARTY_SOURCE_DIR "${CPP_DRIVER_SOURCE_DIR}/third_party")
-set(RAPID_JSON_INCLUDE_DIR "${CPP_DRIVER_THIRD_PARTY_SOURCE_DIR}/rapidjson")
-if(NOT EXISTS "${CPP_DRIVER_DIR}/CMakeLists.txt")
-    find_package(Git REQUIRED)
-    execute_process(COMMAND git submodule update --init --recursive
-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-        OUTPUT_QUIET)
+
+set(CASS_USE_STATIC_LIBS ${DSE_USE_STATIC_LIBS})
+set(CASS_USE_BOOST_ATOMIC ${DSE_USE_BOOST_ATOMIC})
+set(CASS_USE_STD_ATOMIC ${DSE_USE_STD_ATOMIC})
+set(CASS_USE_OPENSSL ${DSE_USE_OPENSSL})
+set(CASS_USE_TCMALLOC ${DSE_USE_TCMALLOC})
+set(CASS_USE_SPARSEHASH ${DSE_USE_SPARSEHASH})
+set(CASS_USE_ZLIB ${DSE_USE_ZLIB})
+set(CASS_USE_LIBSSH2 ${DSE_USE_LIBSSH2})
+
+#---------------
+# Dependencies
+#---------------
+
+CassUseLibuv()
+
+#------------------------
+# Optional Dependencies
+#------------------------
+
+# Boost
+if(CASS_USE_BOOST_ATOMIC)
+  CassUseBoost()
 endif()
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CPP_DRIVER_DIR}/cmake/modules/")
-add_subdirectory(${CPP_DRIVER_DIR})
-set_property(TARGET cassandra PROPERTY FOLDER "Driver/Cassandra")
-if(NOT CMAKE_VERSION VERSION_LESS "2.8.8")
-  set_property(TARGET cpp-driver PROPERTY FOLDER "Driver/Cassandra")
+
+# Sparsehash
+if(CASS_USE_SPARSEHASH)
+  CassUseSparshHash()
 endif()
-set(DSE_LIBS ${CASS_LIBS})
+
+
+# OpenSSL
+if(CASS_USE_OPENSSL)
+  CassUseOpenSSL()
+endif()
+
+# tcmalloc
+if(CASS_USE_TCMALLOC)
+  CassUseTcmalloc()
+endif()
+
+# zlib
+if(CASS_USE_ZLIB)
+  CassUseZlib()
+endif()
+
+CassSetCompilerFlags()
+CassAddIncludes()
+CassFindSourceFiles()
+source_group("Source Files\\Cassandra" FILES ${SRC_FILES})
+source_group("Header Files\\Cassandra" FILES ${API_HEADER_FILES} ${INC_FILES})
 
 # Build up the include paths
+set(DSE_INCLUDES ${CASS_INCLUDES})
 set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 set(DSE_INCLUDES ${DSE_INCLUDES} ${PROJECT_INCLUDE_DIR})
 set(DSE_INCLUDES ${DSE_INCLUDES} ${PROJECT_SOURCE_DIR}/src)
 set(DSE_INCLUDES ${DSE_INCLUDES} ${RAPID_JSON_INCLUDE_DIR})
 set(DSE_INCLUDES ${DSE_INCLUDES} ${LIBUV_INCLUDE_DIR})
 set(DSE_INCLUDES ${DSE_INCLUDES} ${OPENSSL_INCLUDE_DIR})
 
-# Determine which driver target should be used as a dependency
-if(DSE_USE_STATIC_LIBS)
-  set(DSE_BUILD_STATIC ON)
-  set(DSE_LIBS ${DSE_LIBS} cassandra_static)
-  set(PROJECT_LIB_NAME_TARGET ${PROJECT_LIB_NAME_STATIC})
-  set_property(TARGET cassandra_static PROPERTY COMPILE_FLAGS "-fPIC")
-else()
-  set(PROJECT_LIB_NAME_TARGET ${PROJECT_LIB_NAME})
-  set(DSE_LIBS ${DSE_LIBS} cassandra)
-endif()
-if(DSE_BUILD_STATIC)
-  set_property(TARGET cassandra_static PROPERTY FOLDER "Driver/Cassandra")
-endif()
+# Build up libraries
+set(DSE_LIBS ${CASS_LIBS})
 
 # Kerberos
 find_package(Kerberos REQUIRED)
 set(DSE_INCLUDES ${DSE_INCLUDES} ${KERBEROS_INCLUDE_DIR})
 set(DSE_LIBS ${DSE_LIBS} ${KERBEROS_LIBRARIES})
 
+# Build up compiler flags
+set(PROJECT_CXX_FLAGS ${CASS_DRIVER_CXX_FLAGS})
+set(TEST_CXX_FLAGS ${CASS_TEST_CXX_FLAGS})
+
 #------------------------------
 # DSE static and shared
 #------------------------------
 
+# Copy "cassandra.h"
+configure_file(${PROJECT_SOURCE_DIR}/cpp-driver/include/cassandra.h
+               ${PROJECT_SOURCE_DIR}/include/dse/cassandra.h
+               COPYONLY)
+
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -131,7 +185,9 @@ file(GLOB DSE_SRC_FILES ${PROJECT_SOURCE_DIR}/src/*.cpp)
 
 source_group("Source Files" FILES ${DSE_SRC_FILES})
 source_group("Header Files" FILES ${DSE_API_HEADER_FILES} ${DSE_INC_FILES})
-set(DSE_ALL_SOURCE_FILES ${DSE_SRC_FILES} ${DSE_API_HEADER_FILES} ${DSE_INC_FILES})
+set(DSE_ALL_SOURCE_FILES
+  ${DSE_SRC_FILES} ${DSE_API_HEADER_FILES}
+  ${DSE_INC_FILES} ${CASS_ALL_SOURCE_FILES})
 
 # Create an object library for the driver (single build)
 if(NOT CMAKE_VERSION VERSION_LESS "2.8.8")
@@ -181,6 +237,7 @@ if(DSE_BUILD_STATIC)
   target_link_libraries(${PROJECT_LIB_NAME_STATIC} ${DSE_LIBS})
   set_target_properties(${PROJECT_LIB_NAME_STATIC} PROPERTIES OUTPUT_NAME ${PROJECT_LIB_NAME_STATIC})
   set_target_properties(${PROJECT_LIB_NAME_STATIC} PROPERTIES VERSION ${PROJECT_VERSION_STRING} SOVERSION ${PROJECT_VERSION_MAJOR})
+  set_target_properties(${PROJECT_LIB_NAME_STATIC} PROPERTIES LINK_FLAGS "${PROJECT_CXX_LINKER_FLAGS}")
   set_property(
     TARGET ${PROJECT_LIB_NAME_STATIC}
     APPEND PROPERTY COMPILE_FLAGS "${PROJECT_CXX_FLAGS} -DDSE_STATIC")
@@ -243,8 +300,22 @@ set(INSTALL_DLL_EXE_DIR "bin")
 # Install targets
 #------------------------------
 
+if(DSE_INSTALL_PKG_CONFIG)
+  if(NOT WIN32)
+    find_package(PkgConfig)
+    if(PKG_CONFIG_FOUND)
+      set(prefix ${CMAKE_INSTALL_PREFIX})
+      set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+      set(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+      set(includedir ${CMAKE_INSTALL_PREFIX}/include)
+      set(version ${PROJECT_VERSION_STRING})
+    endif()
+  endif()
+endif()
+
 # Determine if the header should be installed
 if(DSE_INSTALL_HEADER)
+  install(DIRECTORY include/dse DESTINATION include FILES_MATCHING PATTERN "*.h")
   install(FILES ${DSE_API_HEADER_FILES} DESTINATION "include")
 endif()
 
@@ -254,4 +325,29 @@ if(DSE_BUILD_SHARED)
     RUNTIME DESTINATION ${INSTALL_DLL_EXE_DIR}  # for dll/executable files
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}  # for shared library
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) # for static library
+  if(DSE_INSTALL_PKG_CONFIG)
+    if(NOT WIN32)
+      if(PKG_CONFIG_FOUND)
+        configure_file("${PROJECT_SOURCE_DIR}/packaging/dse.pc.in" "dse.pc" @ONLY)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dse.pc"
+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+      endif()
+    endif()
+  endif()
+endif()
+
+if(DSE_BUILD_STATIC)
+  install(TARGETS ${PROJECT_LIB_NAME_STATIC}
+    RUNTIME DESTINATION ${INSTALL_DLL_EXE_DIR}  # for dll/executable files
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}  # for shared library
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) # for static library
+  if(DSE_INSTALL_PKG_CONFIG)
+    if(NOT WIN32)
+      if(PKG_CONFIG_FOUND)
+        configure_file("${PROJECT_SOURCE_DIR}/packaging/dse_static.pc.in" "dse_static.pc" @ONLY)
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/dse_static.pc"
+          DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+      endif()
+    endif()
+  endif()
 endif()