update to fix

abumq · Aug 4, 2017 · e8e294f · e8e294f
1 parent 6f5a09c
commit e8e294f
Show file tree

Hide file tree

Showing 9 changed files with 228 additions and 282 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+build
+CMakeLists.txt.user
+CMakeFiles
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,87 +1,33 @@
 cmake_minimum_required (VERSION 2.8.12)
 
-project (Residue)
+project (Residue-C++)
 
-option (test "Build all tests" OFF)
-option (travis "Travis CI" OFF)
-option (production "Build for production" ON)
-option (debug "Enable debug logging" OFF)
-option (build_static_lib "Build residue as a static library (as opposed to default, i.e, shared)" OFF)
 option (build_sample_app "Builds detailed-cmake sample" OFF)
 option (profiling "Turns profiling on for various scenarios" OFF)
-option (compile-server "Turn it on when you have source code available for the server" OFF)
+option (travis "Whether its travis build or not" OFF)
 option (static_ripe "Prefer static ripe library" OFF)
-option (BUILD_SHARED_LIBS "build shared libraries" OFF)
+option (BUILD_SHARED_LIBS "build shared libraries" ON)
 
 set (RESIDUE_MAJOR "1")
 set (RESIDUE_MINOR "0")
 set (RESIDUE_PATCH "0-beta.14")
-set (RESIDUE_VERSION "${RESIDUE_MAJOR}.${RESIDUE_MINOR}.${RESIDUE_PATCH}")
+
 set (RESIDUE_SOVERSION "${RESIDUE_MAJOR}.${RESIDUE_MINOR}.${RESIDUE_PATCH}")
-set (RESIDUE_NAME "Residue")
+set (RESIDUE_NAME "Residue-C++")
 
-add_definitions (-DRESIDUE_VERSION="${RESIDUE_VERSION}")
 add_definitions (-DRESIDUE_SOVERSION="${RESIDUE_SOVERSION}")
 
-# set(CMAKE_MACOSX_RPATH 1)
-
-# We need C++11
-macro (require_cpp11)
-        if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 3.0)
-                # CMake 3.1 has built-in CXX standard checks.
-                message ("-- Setting C++11")
-                set (CMAKE_CXX_STANDARD 11)
-                set (CMAKE_CXX_STANDARD_REQUIRED on)
-        else()
-                if (CMAKE_CXX_COMPILER_ID MATCHES "GCC")
-                    message ("-- GNU CXX (-std=c++11)")
-                    list (APPEND CMAKE_CXX_FLAGS "-std=c++11")
-                elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-                    message ("-- GNU CXX (-std=c++11)")
-                    list (APPEND CMAKE_CXX_FLAGS "-std=c++11")
-                elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-                    message ("-- CLang CXX (-std=c++11)")
-                    list (APPEND CMAKE_CXX_FLAGS "-std=c++11")
-                else()
-                    message ("-- Requires C++11. Your compiler does not support it.")
-                endif()
-        endif()
-endmacro()
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+include(residue-dev)
 
 if (profiling)
     add_definitions (-DRESIDUE_PROFILING)
 endif()
 
-if (debug)
-    message ("-- DEBUGGING IS ON")
-    add_definitions (-DRESIDUE_DEBUG)
-else()
-    message ("-- DEBUGGING IS OFF")
-endif()
-
-if (production)
-    message ("-- PRODUCTION BUILD")
-    add_definitions (-DRESIDUE_PRODUCTION)
-endif()
-
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
-
 include (FindPackageHandleStandardArgs)
 
 require_cpp11()
-
-# http://www.cmake.org/Wiki/CMake_RPATH_handling#Mac_OS_X_and_the_RPATH
-if (APPLE)
-    set (CMAKE_MACOSX_RPATH ON)
-    set (CMAKE_SKIP_BUILD_RPATH FALSE)
-    set (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-    set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-    list (FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-    if ("${isSystemDir}" STREQUAL "-1")
-        set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-    endif()
-endif()
+check_apple()
 
 if (travis)
 else()
@@ -98,47 +44,25 @@ include_directories (${RIPE_INCLUDE_DIR})
 
 message ("-- Check for Boost System (static)")
 ## We always use static linking for boost stuffs
-set (Boost_USE_STATIC_LIBS OFF) ## TODO: Fix this and turn it off
+set (Boost_USE_STATIC_LIBS OFF) ## TODO: Fix this and turn it ON
 find_package (Boost REQUIRED COMPONENTS system)
 include_directories (${Boost_INCLUDE_DIR})
 message ("-- Boost binary: " ${Boost_LIBRARIES})
 
-# Check for include files and stdlib properties.
-include (CheckIncludeFileCXX)
-check_include_file_cxx (attr/xattr.h HAVE_ATTR_XATTR_H)
-check_include_file_cxx (sys/xattr.h HAVE_SYS_XATTR_H)
-
-# Check if xattr functions take extra arguments, as they do on OSX.
-# Output error is misleading, so do this test quietly.
-include (CheckCXXSourceCompiles)
-set (CMAKE_REQUIRED_QUIET_SAVE ${CMAKE_REQUIRED_QUIET})
-set (CMAKE_REQUIRED_QUIET True)
-check_cxx_source_compiles ("#include <sys/types.h>
-#include <sys/xattr.h>
-int main() { getxattr(0,0,0,0,0,0); return 1; }
-" XATTR_ADD_OPT)
-set (CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
-
-set (CMAKE_THREAD_PREFER_PTHREAD)
-find_package (Threads REQUIRED)
+thread_packages_check()
 
 
 ############# RESIDUE CLIENT LIB ###############
 
 set(LIB_RESIDUE_SOURCE_FILES
-    lib/Residue.cc
+    src/Residue.cc
     ${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc
 )
 
-if (build_static_lib)
-    add_library (residue-lib STATIC ${LIB_RESIDUE_SOURCE_FILES})
-else()
-    add_library (residue-lib SHARED ${LIB_RESIDUE_SOURCE_FILES})
-endif()
+add_library (residue-lib ${LIB_RESIDUE_SOURCE_FILES})
 
 set_target_properties (residue-lib PROPERTIES
-    VERSION ${RESIDUE_VERSION}
-    SOVERSION ${RESIDUE_SOVERSION}
+    VERSION ${RESIDUE_SOVERSION}
 )
 target_link_libraries (residue-lib
     ${Boost_LIBRARIES}
@@ -166,9 +90,12 @@ install (FILES include/Residue.h DESTINATION "include")
 ############# SAMPLE CLIENT APP ###############
 
 if (build_sample_app)
-    add_subdirectory (samples/clients/c++/detailed-cmake/)
+    add_definitions (-DROOT_SAMPLE_BUILD)
+    add_subdirectory (samples/detailed-cmake/)
 endif()
 
+############## Cmake Package #################
+
 # Packaging config.
 set (CPACK_PACKAGE_NAME "Residue")
 set (CPACK_PACKAGE_VERSION_MAJOR ${RESIDUE_MAJOR})
@@ -189,152 +116,3 @@ include_directories (${CMAKE_BINARY_DIR})
 include_directories (${CMAKE_SOURCE_DIR})
 
 
-############# SERVER ###############
-
-if (compile-server)
-    set (SOURCE_FILES
-        src/Url.cc
-        src/Utils.cc
-        src/Configuration.cc
-        src/Registry.cc
-        src/RequestHandler.cc
-        src/TokenRequestHandler.cc
-        src/LogRequestHandler.cc
-        src/ConnectionRequestHandler.cc
-        src/AdminRequestHandler.cc
-        src/Session.cc
-        src/JsonObject.cc
-        src/Request.cc
-        src/Response.cc
-        src/AdminRequest.cc
-        src/ConnectionRequest.cc
-        src/ConnectionResponse.cc
-        src/LogRequest.cc
-        src/TokenRequest.cc
-        src/Server.cc
-        src/UserLogBuilder.cc
-        src/Token.cc
-        src/Client.cc
-        src/TokenResponse.cc
-        src/ClientIntegrityTask.cc
-        src/LogRotator.cc
-        src/Task.cc
-        src/CommandHandler.cc
-        src/Tar.cc
-    )
-
-    set (SHARED_REQUIRED_LIBS
-        ${RIPE_LIBRARY}
-        ${Boost_LIBRARIES}
-        ${CMAKE_THREAD_LIBS_INIT}
-    )
-
-    ############# RESIDUE CORE LIB (STATIC) ###############
-
-    add_library (residue-core ${SOURCE_FILES})
-
-    set_target_properties (residue-core PROPERTIES
-        VERSION ${RESIDUE_VERSION}
-        SOVERSION ${RESIDUE_SOVERSION}
-    )
-
-    target_link_libraries (residue-core ${SHARED_REQUIRED_LIBS})
-
-    target_compile_definitions (residue-core PUBLIC
-        ELPP_FORCE_USE_STD_THREAD
-        ELPP_THREAD_SAFE
-    )
-
-    # Set RPATH to library install path.
-    set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
-
-    ############# CONFIG VALIDATOR TOOL ###############
-
-    #add_executable (config-validator-bin
-    #    tools/config-validator/config-validator.cc
-    #    ${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc
-    #)
-
-    #target_compile_definitions (config-validator-bin PUBLIC
-    #    ELPP_NO_DEFAULT_LOG_FILE
-    #    ELPP_NO_LOG_TO_FILE
-    #    ELPP_STL_LOGGING
-    #    AUTO_INITIALIZE_EASYLOGGINGPP
-    #    ELPP_DEFAULT_LOGGING_FLAGS=4096
-    #)
-
-    #target_link_libraries (config-validator-bin ${RIPE_LIBRARY} residue-core)
-
-    #set_target_properties (config-validator-bin PROPERTIES
-    #    OUTPUT_NAME "config-validator"
-    #    VERSION ${RESIDUE_VERSION}
-    #    SOVERSION ${RESIDUE_SOVERSION}
-    #)
-
-    # -- DO NOT UNCOMMENT install (TARGETS config-validator-bin DESTINATION bin)
-
-
-    ############# RESIDUE BINARY ###############
-
-    add_executable (residue-bin
-        src/main.cc
-        ${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc
-    )
-
-    target_compile_definitions (residue-bin PUBLIC
-        ELPP_STL_LOGGING
-        ELPP_STACKTRACE
-        ELPP_FEATURE_CRASH_LOG
-        ELPP_DEFAULT_LOG_FILE="/tmp/logs/residue_default_logger.log"
-    )
-
-    set_target_properties (residue-bin PROPERTIES
-        VERSION ${RESIDUE_VERSION}
-        SOVERSION ${RESIDUE_SOVERSION}
-        OUTPUT_NAME "residue"
-    )
-
-    target_link_libraries (residue-bin residue-core)
-
-    set_target_properties (residue-bin PROPERTIES OUTPUT_NAME "residue")
-    install (TARGETS residue-bin DESTINATION bin)
-
-    #############################################
-
-    # Reference all headers, to make certain IDEs happy.
-    file (GLOB_RECURSE all_headers ${CMAKE_SOURCE_DIR}/*.h)
-    add_custom_target (all_placeholder SOURCES ${all_headers})
-
-
-    ############# RESIDUE TESTS ###############
-    if (test)
-
-        find_package (gtest REQUIRED)
-
-        include_directories (${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
-
-        enable_testing()
-
-        add_executable (residue-unit-tests
-            test/main.cc
-            ${EASYLOGGINGPP_INCLUDE_DIR}/easylogging++.cc
-        )
-
-        target_compile_definitions (residue-unit-tests PUBLIC
-            ELPP_FEATURE_ALL
-            ELPP_DEFAULT_LOG_FILE="/tmp/logs/residue_unit_tests.log"
-            ELPP_DEFAULT_LOGGING_FLAGS=4096
-        )
-
-        # Standard linking to gtest stuff.
-        target_link_libraries (residue-unit-tests gtest gtest_main)
-
-        # Extra linking for the project.
-        target_link_libraries (residue-unit-tests residue-core)
-
-        target_link_libraries (residue-unit-tests ${SHARED_REQUIRED_LIBS})
-
-        add_test (NAME residueUnitTests COMMAND residue-unit-tests)
-    endif() ## test
-endif() ## Compile server
diff --git a/cmake/FindEASYLOGGINGPP.cmake b/cmake/FindEASYLOGGINGPP.cmake
@@ -0,0 +1,38 @@
+#
+# CMake module for Easylogging++ logging library
+#
+# Defines ${EASYLOGGINGPP_INCLUDE_DIR}
+#
+# If ${EASYLOGGINGPP_USE_STATIC_LIBS} is ON then static libs are searched.
+# In these cases ${EASYLOGGINGPP_LIBRARY} is also defined
+#
+# (c) 2017 Muflihun Labs
+#
+# https://github.com/muflihun/easyloggingpp
+# https://muflihun.com
+#
+
+message ("-- Easylogging++: Searching...")
+set(EASYLOGGINGPP_PATHS ${EASYLOGGINGPP_ROOT} $ENV{EASYLOGGINGPP_ROOT})
+
+find_path(EASYLOGGINGPP_INCLUDE_DIR
+        easylogging++.h
+        PATH_SUFFIXES include
+        PATHS ${EASYLOGGINGPP_PATHS}
+)
+
+if (EASYLOGGINGPP_USE_STATIC_LIBS)
+    message ("-- Easylogging++: Static linking is preferred")
+    find_library(EASYLOGGINGPP_LIBRARY
+        NAMES libeasyloggingpp.a libeasyloggingpp.dylib libeasyloggingpp
+        HINTS "${CMAKE_PREFIX_PATH}/lib"
+    )
+elseif (EASYLOGGINGPP_USE_SHARED_LIBS)
+    message ("-- Easylogging++: Dynamic linking is preferred")
+    find_library(EASYLOGGINGPP_LIBRARY
+        NAMES libeasyloggingpp.dylib libeasyloggingpp libeasyloggingpp.a
+        HINTS "${CMAKE_PREFIX_PATH}/lib"
+    )
+endif()
+
+find_package_handle_standard_args(EASYLOGGINGPP REQUIRED_VARS EASYLOGGINGPP_INCLUDE_DIR)