updated build system

cmake/flags.cmake

@@ -1,4 +1,7 @@
-list(APPEND PROJECT_COMMON_FLAG_LIST 
+list(APPEND PROJECT_COMMON_FLAG_LIST
+  -D_GNU_SOURCE
+  -D_LARGEFILE_SOURCE
+  -D_LARGEFILE64_SOURCE
   -D_FILE_OFFSET_BITS=64 
   -D_TIME_BITS=64
   -march=${PROJECT_MARCH}

cmake/functions.cmake

@@ -26,21 +26,7 @@ function(set_common_target_options name)
   endif()
 endfunction(set_common_target_options)
 
-function(add_project_executable name dependencies libraries)
-  file(GLOB_RECURSE headers
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hh
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hxx
-  )
-
-  file(GLOB_RECURSE sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cc
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cxx
-  )
-
+function(add_project_executable2 name dependencies libraries headers sources)
   if (PROJECT_WINDOWS_VERSION_RC)
     list(APPEND sources ${PROJECT_WINDOWS_VERSION_RC})
   endif()
@@ -62,6 +48,28 @@ function(add_project_executable name dependencies libraries)
   endif()
 
   target_link_libraries(${name} PRIVATE ${libraries})
+
+  if(PROJECT_ENABLE_SDL AND PROJECT_IS_MINGW)
+    target_link_libraries(${name} PRIVATE SDL2::SDL2main)
+  endif ()
+endfunction(add_project_executable2)
+
+function(add_project_executable name dependencies libraries)
+  file(GLOB_RECURSE headers
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hxx
+  )
+
+  file(GLOB_RECURSE sources
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cc
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cxx
+  )
+
+  add_project_executable2(${name} "${dependencies}" "${libraries}" "${headers}" "${sources}")
 endfunction(add_project_executable)
 
 function(add_project_library name dependencies libraries additional_sources)
@@ -96,7 +104,24 @@ function(add_project_test_executable name dependencies libraries)
     find_package(GTest ${GTEST_VERSION} REQUIRED)
     enable_testing()
 
-    add_project_executable(${name} "${dependencies}" "${libraries}")
+    file(GLOB_RECURSE headers
+      ${PROJECT_3RD_PARTY_DIR}/test/include/*.hpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.h
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/*.hh
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/*.hpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/include/${name}/include/${name}/include/*.hxx
+    )
+
+    file(GLOB_RECURSE sources
+      ${PROJECT_3RD_PARTY_DIR}/test/src/*.cpp
+      ${additional_sources}
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.c
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cc
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}/${name}/src/*.cxx
+    )
+
+    add_project_executable2(${name} "${dependencies}" "${libraries}" "${headers}" "${sources}")
 
     target_compile_definitions(${name} PRIVATE -DPROJECT_TESTING)
 
@@ -104,6 +129,10 @@ function(add_project_test_executable name dependencies libraries)
       ${GTEST_INCLUDE_DIRS}
     )
 
+    target_include_directories(${name} AFTER PRIVATE
+      ${PROJECT_3RD_PARTY_DIR}/test/include
+    )
+
     target_link_libraries(${name} PRIVATE
       GTest::gtest 
       GTest::gmock 

cmake/libraries/backward_cpp.cmake

@@ -1,8 +1,8 @@
 if(PROJECT_ENABLE_BACKWARD_CPP AND PROJECT_BUILD)
-  add_definitions(-DPROJECT_ENABLE_BACKWARD_CPP)
-
   if(PROJECT_IS_MINGW)
     link_libraries(msvcr90)
+
+    add_definitions(-DPROJECT_ENABLE_BACKWARD_CPP)
   else()
     link_libraries(bfd)
     add_definitions(-DBACKWARD_HAS_BFD)

cmake/libraries/boost.cmake

@@ -1,8 +1,6 @@
 set(Boost_USE_STATIC_LIBS ${PROJECT_STATIC_LINK})
 
 if(PROJECT_ENABLE_BOOST)
-  add_definitions(-DPROJECT_ENABLE_BOOST)
-
   if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
     set(BOOST_MAJOR_VERSION ${BOOST2_MAJOR_VERSION})
     set(BOOST_MINOR_VERSION ${BOOST2_MINOR_VERSION})
@@ -40,6 +38,8 @@ if(PROJECT_ENABLE_BOOST)
         wserialization
     )
 
+    add_definitions(-DPROJECT_ENABLE_BOOST)
+
     include_directories(BEFORE SYSTEM
       ${Boost_INCLUDE_DIRS}
     )
@@ -107,5 +107,7 @@ if(PROJECT_ENABLE_BOOST)
     )
 
     list(APPEND PROJECT_DEPENDENCIES boost_project)
+
+    add_dependencies(boost_project openssl_project)
   endif()
 endif()

cmake/libraries/cpp_httplib.cmake

@@ -1,15 +1,10 @@
 if(PROJECT_ENABLE_CPP_HTTPLIB)
   if(PROJECT_BUILD)
-    if(PROJECT_ENABLE_OPENSSL)
-      add_definitions(
-        -DCPPHTTPLIB_OPENSSL_SUPPORT
-      )
-    endif()
-
     add_definitions(
-      -DPROJECT_ENABLE_CPP_HTTPLIB
+      -DCPPHTTPLIB_OPENSSL_SUPPORT
       -DCPPHTTPLIB_TCP_NODELAY=true
       -DCPPHTTPLIB_ZLIB_SUPPORT
+      -DPROJECT_ENABLE_CPP_HTTPLIB
     )
   elseif(NOT PROJECT_IS_MINGW OR CMAKE_HOST_WIN32)
     ExternalProject_Add(cpphttplib_project
@@ -29,10 +24,9 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
 
     list(APPEND PROJECT_DEPENDENCIES cpphttplib_project)
 
-    add_dependencies(cpphttplib_project curl_project)
-
-    if(PROJECT_ENABLE_OPENSSL)
-      add_dependencies(cpphttplib_project openssl_project)
-    endif()
+    add_dependencies(cpphttplib_project 
+      curl_project
+      openssl_project
+    )
   endif()
 endif()

cmake/libraries/curl.cmake

@@ -48,8 +48,6 @@ if(PROJECT_ENABLE_CURL)
 
     list(APPEND PROJECT_DEPENDENCIES curl_project)
 
-    if(PROJECT_ENABLE_OPENSSL)
-      add_dependencies(curl_project openssl_project)
-    endif()
+    add_dependencies(curl_project openssl_project)
   endif()
 endif()

cmake/libraries/fuse.cmake

@@ -1,6 +1,7 @@
 if(PROJECT_ENABLE_FUSE AND NOT PROJECT_IS_MINGW)
   if(PROJECT_BUILD)
     add_definitions(-DPROJECT_ENABLE_FUSE)
+
     include_directories(BEFORE SYSTEM ${PROJECT_FUSE_INCLUDE_DIRS})
 
     if(PROJECT_FUSE STREQUAL "fuse3")
@@ -18,11 +19,6 @@ if(PROJECT_ENABLE_FUSE AND NOT PROJECT_IS_MINGW)
         link_libraries(fuse)
       endif()
     endif()
-
-    check_include_files(sys/xattr.h HAS_SETXATTR)
-    if(HAS_SETXATTR)
-      add_definitions(-DHAS_SETXATTR)
-    endif()
   else()
     pkg_check_modules(LIBFUSE3 fuse3>=3.0.0)
     if(LIBFUSE3_FOUND)