Merge pull request #1147 from asiniscalchi/dev_noon_cmake_refactoring

[eos-noon] cmake refactoring + cpack

.gitignore

@@ -8,7 +8,6 @@
 *.wasm
 *.s
 *.dot
-*.cmake
 \#*
 \.#*
 CMakeCache.txt

.travis.yml

@@ -78,3 +78,4 @@ script:
   - ${CMAKE_DIR}cmake -G Ninja -DWASM_LLVM_CONFIG=$TRAVIS_BUILD_DIR/ext/wasm-compiler/bin/llvm-config -DSecp256k1_ROOT_DIR=$TRAVIS_BUILD_DIR/ext -DBINARYEN_ROOT=$TRAVIS_BUILD_DIR/ext/wasm-compiler -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/ext -DCMAKE_BUILD_TYPE=Release -DBUILD_MONGO_DB_PLUGIN=true $EOS_CMAKE_OPTIONS ..
   - ninja -j4
   - '[ "$TRAVIS_OS_NAME" == "osx" ] || ctest --output-on-failure'
+  - cpack

CMakeLists.txt

@@ -5,6 +5,7 @@ cmake_minimum_required( VERSION 2.8.12 )
 enable_testing()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
 
 INCLUDE( VersionMacros )
 INCLUDE( SetupTargetMacros )
@@ -32,35 +33,19 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
     endif()
 endif()
 
-list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
+
 
 set(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
 set(BUILD_DOXYGEN FALSE CACHE BOOL "Build doxygen documentation on every make")
 set(BUILD_MONGO_DB_PLUGIN FALSE CACHE BOOL "Build mongo database plugin")
 set(EOS_EGENESIS_JSON "${CMAKE_CURRENT_SOURCE_DIR}/genesis.json" )
 
-#set (ENABLE_INSTALLER 1)
 #set (USE_PCH 1)
 
 if (USE_PCH)
   include (cotire)
 endif(USE_PCH)
 
-list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules" )
-
-SET(BOOST_COMPONENTS)
-LIST(APPEND BOOST_COMPONENTS thread
-                             date_time
-                             system
-                             filesystem
-                             program_options
-                             signals
-                             serialization
-                             chrono
-                             unit_test_framework
-                             context
-                             locale)
-SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 
 if(UNIX)
   if(APPLE)
@@ -75,20 +60,24 @@ else()
   set(no_whole_archive_flag "--no-whole-archive")
 endif()
 
+SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 IF( WIN32 )
   SET(BOOST_ROOT $ENV{BOOST_ROOT})
   set(Boost_USE_MULTITHREADED ON)
   set(BOOST_ALL_DYN_LINK OFF) # force dynamic linking for all libraries
 ENDIF(WIN32)
-
-FIND_PACKAGE(Boost 1.64 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
-# For Boost 1.53 on windows, coroutine was not in BOOST_LIBRARYDIR and do not need it to build,  but if boost versin >= 1.54, find coroutine otherwise will cause link errors
-IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
-   SET(BOOST_LIBRARIES_TEMP ${Boost_LIBRARIES})
-   FIND_PACKAGE(Boost 1.54 REQUIRED COMPONENTS coroutine)
-   LIST(APPEND BOOST_COMPONENTS coroutine)
-   SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
-ENDIF()
+FIND_PACKAGE(Boost 1.64 REQUIRED COMPONENTS
+    thread
+    date_time
+    system
+    filesystem
+    program_options
+    signals
+    serialization
+    chrono
+    unit_test_framework
+    context
+    locale)
 
 if( WIN32 )
 
@@ -140,13 +129,6 @@ else( WIN32 ) # Apple AND Linux
         # Linux Specific Options Here
         message( STATUS "Configuring Eos on Linux" )
         set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall" )
-        set( rt_library rt )
-        set( pthread_library pthread)
-        if ( NOT DEFINED crypto_library )
-          # I'm not sure why this is here, I guess someone has openssl and can't detect it with find_package()?
-          # if you have a normal install, you can define crypto_library to the empty string to avoid a build error
-          set( crypto_library crypto)
-        endif ()
         if ( FULL_STATIC_BUILD )
           set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
         endif ( FULL_STATIC_BUILD )
@@ -199,77 +181,7 @@ add_subdirectory( scripts )
 add_subdirectory( tests )
 add_subdirectory( tools )
 
-if (ENABLE_INSTALLER)
-
-include(InstallRequiredSystemLibraries)
-
-set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/packages)
-set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
-
-SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
-set(CPACK_PACKAGE_NAME "eos")
-set(CPACK_PACKAGE_VENDOR "EOSIO")
-set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_DESCRIPTION "A client for the Eos network")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the Eos network")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "Eos ${CPACK_PACKAGE_VERSION}")
-
-if(WIN32)
- SET(CPACK_GENERATOR "ZIP;NSIS")
- set(CPACK_PACKAGE_NAME "Eos") # override above
- set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
- set(CPACK_NSIS_PACKAGE_NAME "Eos v${CPACK_PACKAGE_VERSION}")
- set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
- set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"Eos\\\"")
- # it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
- SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
-
-endif(WIN32)
-
-if(APPLE)
-  set(CPACK_GENERATOR "DragNDrop")
-endif()
-
-if(LINUX)
-  # Linux gets a .tgz
-  SET(CPACK_GENERATOR "TGZ")
-  SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
-endif(LINUX)
-
- include(CPack)
-endif(ENABLE_INSTALLER)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/genesis.json ${CMAKE_CURRENT_BINARY_DIR}/genesis.json COPYONLY)
 
-include(FindDoxygen)
-
-if(NOT DOXYGEN_FOUND)
-  message(STATUS "Doxygen not found.  Contract documentation will not be generated.")
-else()
-  set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
-  # CMake strips trailing path separators off of variables it knows are paths,
-  # so the trailing '/' Doxygen expects is embedded in the doxyfile.
-  set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output")
-  set(DOXY_DOC_INPUT_ROOT_DIR "contracts" CACHE PATH "Path to the doxygen input")
-  if(DOXYGEN_DOT_FOUND)
-    set(DOXY_HAVE_DOT "YES" CACHE STRING "Doxygen to use dot for diagrams.")
-  else(DOXYGEN_DOT_FOUND)
-    set(DOXY_HAVE_DOT "NO" CACHE STRING "Doxygen to use dot for diagrams.")
-  endif(DOXYGEN_DOT_FOUND)
-  configure_file("eos.doxygen.in" "${CMAKE_BINARY_DIR}/eos.doxygen")
-  if(BUILD_DOXYGEN) 
-    message(STATUS "Doxygen found.  Contract documentation will be generated.")
-    # Doxygen has issues making destination directories more than one level deep, so do it for it.
-    add_custom_target(make_doc_dir ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${DOXY_DOC_DEST_DIR}")
-    add_custom_target(contract_documentation ALL
-      COMMAND "${DOXYGEN_EXECUTABLE}" "${CMAKE_BINARY_DIR}/eos.doxygen"
-      DEPENDS make_doc_dir
-      WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-      COMMENT "Building doxygen documentation into ${DOXY_DOC_DEST_DIR}..."
-      VERBATIM)
-  endif(BUILD_DOXYGEN)
-endif()
+include(installer)
+include(doxygen)

CMakeModules/doxygen.cmake

+configure_file("eos.doxygen.in" "${CMAKE_BINARY_DIR}/eos.doxygen")
+
+include(FindDoxygen)
+
+if(NOT DOXYGEN_FOUND)
+  message(STATUS "Doxygen not found.  Contract documentation will not be generated.")
+else()
+  set(DOXY_EOS_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" CACHE INTERNAL "Version string used in PROJECT_NUMBER.")
+  # CMake strips trailing path separators off of variables it knows are paths,
+  # so the trailing '/' Doxygen expects is embedded in the doxyfile.
+  set(DOXY_DOC_DEST_DIR "${CMAKE_BINARY_DIR}/docs" CACHE PATH "Path to the doxygen output")
+  set(DOXY_DOC_INPUT_ROOT_DIR "contracts" CACHE PATH "Path to the doxygen input")
+  if(DOXYGEN_DOT_FOUND)
+    set(DOXY_HAVE_DOT "YES" CACHE STRING "Doxygen to use dot for diagrams.")
+  else(DOXYGEN_DOT_FOUND)
+    set(DOXY_HAVE_DOT "NO" CACHE STRING "Doxygen to use dot for diagrams.")
+  endif(DOXYGEN_DOT_FOUND)
+  if(BUILD_DOXYGEN)
+    message(STATUS "Doxygen found.  Contract documentation will be generated.")
+    # Doxygen has issues making destination directories more than one level deep, so do it for it.
+    add_custom_target(make_doc_dir ALL COMMAND ${CMAKE_COMMAND} -E make_directory "${DOXY_DOC_DEST_DIR}")
+    add_custom_target(contract_documentation ALL
+      COMMAND "${DOXYGEN_EXECUTABLE}" "${CMAKE_BINARY_DIR}/eos.doxygen"
+      DEPENDS make_doc_dir
+      WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+      COMMENT "Building doxygen documentation into ${DOXY_DOC_DEST_DIR}..."
+      VERBATIM)
+  endif(BUILD_DOXYGEN)
+endif()

CMakeModules/installer.cmake

+include(InstallRequiredSystemLibraries)
+
+set(CPACK_PACKAGE_CONTACT "support@block.one")
+set(CPACK_OUTPUT_FILE_PREFIX ${CMAKE_BINARY_DIR}/packages)
+set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install)
+
+SET(CPACK_PACKAGE_DIRECTORY "${CMAKE_INSTALL_PREFIX}")
+set(CPACK_PACKAGE_NAME "EOS.IO")
+set(CPACK_PACKAGE_VENDOR "block.one")
+set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+set(CPACK_PACKAGE_DESCRIPTION "A client for the EOS.IO network")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the EOS.IO network")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "EOS.IO ${CPACK_PACKAGE_VERSION}")
+
+if(WIN32)
+ set(CPACK_GENERATOR "ZIP;NSIS")
+ set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
+ set(CPACK_NSIS_PACKAGE_NAME "EOS.IO v${CPACK_PACKAGE_VERSION}")
+ set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
+ set(CPACK_NSIS_DEFINES "  !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"EOS.IO\\\"")
+ # it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
+ SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
+elseif(APPLE)
+  set(CPACK_GENERATOR "DragNDrop")
+else()
+  # Linux gets a .tgz
+  SET(CPACK_GENERATOR "TGZ;DEB")
+  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+  SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1)
+endif()
+
+include(CPack)