forked from sanada08/belnet
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from Beldex-Coin/dev
From dev
- Loading branch information
Showing
229 changed files
with
4,518 additions
and
2,698 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,13 @@ | ||
| set(CPACK_PACKAGE_VENDOR "belnet.org") | ||
| set(CPACK_PACKAGE_HOMEPAGE_URL "https://belnet.org/") | ||
| set(CPACK_PACKAGE_VENDOR "belnet.beldex.io") | ||
| set(CPACK_PACKAGE_HOMEPAGE_URL "https://belnet.beldex.io/") | ||
| set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/contrib/readme-installer.txt") | ||
| set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") | ||
|
|
||
| if(WIN32) | ||
| include(cmake/win32_installer_deps.cmake) | ||
| endif() | ||
|
|
||
| if(APPLE) | ||
| include(cmake/macos_installer_deps.cmake) | ||
| endif() | ||
|
|
||
|
|
||
| # This must always be last! | ||
| include(CPack) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,49 @@ | ||
| function(check_working_cxx_atomics64 varname) | ||
| set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) | ||
| if (EMBEDDED_CFG) | ||
| set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -m32 -march=i486") | ||
| elseif(MSVC OR MSVC_VERSION) | ||
| set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -arch:IA32 -std:c++14") | ||
| else() | ||
| # CMAKE_CXX_STANDARD does not propagate to cmake compile tests | ||
| set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14") | ||
| endif() | ||
| check_cxx_source_compiles(" | ||
| #include <atomic> | ||
| #include <cstdint> | ||
| std::atomic<uint64_t> x (0); | ||
| int main() { | ||
| uint64_t i = x.load(std::memory_order_relaxed); | ||
| return 0; | ||
| } | ||
| " ${varname}) | ||
| set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) | ||
| endfunction() | ||
|
|
||
| function(link_libatomic) | ||
| check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB) | ||
|
|
||
| if(HAVE_CXX_ATOMICS64_WITHOUT_LIB) | ||
| message(STATUS "Have working 64bit atomics") | ||
| return() | ||
| endif() | ||
|
|
||
| if (NOT MSVC AND NOT MSVC_VERSION) | ||
| check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64) | ||
| if (HAVE_CXX_LIBATOMICS64) | ||
| message(STATUS "Have 64bit atomics via library") | ||
| list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") | ||
| check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB) | ||
| if (HAVE_CXX_ATOMICS64_WITH_LIB) | ||
| message(STATUS "Can link with libatomic") | ||
| link_libraries(-latomic) | ||
| return() | ||
| endif() | ||
| endif() | ||
| endif() | ||
| if (MSVC OR MSVC_VERSION) | ||
| message(FATAL_ERROR "Host compiler must support 64-bit std::atomic! (What does MSVC do to inline atomics?)") | ||
| else() | ||
| message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!") | ||
| endif() | ||
| endfunction() | ||
| function(check_working_cxx_atomics64 varname) | ||
| set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) | ||
| if (EMBEDDED_CFG) | ||
| set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -m32 -march=i486") | ||
| elseif(MSVC OR MSVC_VERSION) | ||
| set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -arch:IA32 -std:c++14") | ||
| else() | ||
| # CMAKE_CXX_STANDARD does not propagate to cmake compile tests | ||
| set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++14") | ||
| endif() | ||
| check_cxx_source_compiles(" | ||
| #include <atomic> | ||
| #include <cstdint> | ||
| std::atomic<uint64_t> x (0); | ||
| int main() { | ||
| uint64_t i = x.load(std::memory_order_relaxed); | ||
| return 0; | ||
| } | ||
| " ${varname}) | ||
| set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS}) | ||
| endfunction() | ||
|
|
||
| function(link_libatomic) | ||
| check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITHOUT_LIB) | ||
|
|
||
| if(HAVE_CXX_ATOMICS64_WITHOUT_LIB) | ||
| message(STATUS "Have working 64bit atomics") | ||
| return() | ||
| endif() | ||
|
|
||
| if (NOT MSVC AND NOT MSVC_VERSION) | ||
| check_library_exists(atomic __atomic_load_8 "" HAVE_CXX_LIBATOMICS64) | ||
| if (HAVE_CXX_LIBATOMICS64) | ||
| message(STATUS "Have 64bit atomics via library") | ||
| list(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") | ||
| check_working_cxx_atomics64(HAVE_CXX_ATOMICS64_WITH_LIB) | ||
| if (HAVE_CXX_ATOMICS64_WITH_LIB) | ||
| message(STATUS "Can link with libatomic") | ||
| link_libraries(-latomic) | ||
| return() | ||
| endif() | ||
| endif() | ||
| endif() | ||
| if (MSVC OR MSVC_VERSION) | ||
| message(FATAL_ERROR "Host compiler must support 64-bit std::atomic! (What does MSVC do to inline atomics?)") | ||
| else() | ||
| message(FATAL_ERROR "Host compiler must support 64-bit std::atomic!") | ||
| endif() | ||
| endfunction() |
Oops, something went wrong.