1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
From d8366419e21cd171de6bb8aaf5b863522ed3398d Mon Sep 17 00:00:00 2001
From: Czarek Nakamoto <cyjan@mrcyjanek.net>
Date: Wed, 4 Dec 2024 17:21:44 -0600
Subject: [PATCH 04/11] use boost::filesystem instead of stdfs
---
CMakeLists.txt | 26 ++++----------------------
contrib/epee/include/file_io_utils.h | 6 +++---
src/gui/qt-daemon/layout | 2 +-
3 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83bf9e6d..c102348b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,14 +241,7 @@ if(Boost_FATLIB)
set(Boost_LIBRARIES ${Boost_FATLIB})
else()
# manually specify boost libs for mobile platforms
- if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
- if(NOT DEFINED SKIP_BOOST_FATLIB_LIB OR NOT SKIP_BOOST_FATLIB_LIB)
- message("Ios: libboost.a included as library")
- set(Boost_LIBRARIES "libboost.a")
- else()
- message("Ios: libboost.a not included as library")
- endif()
- elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
if(CAKEWALLET)
find_package(Boost ${ZANO_BOOST_MIN_VER} REQUIRED COMPONENTS system filesystem locale thread timer date_time chrono regex serialization atomic program_options)
else()
@@ -263,18 +256,7 @@ else()
endif()
message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
-if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
- if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET 12.00)
- endif()
- #workaround for new XCode 12 policy for builds(now it includes a slice for the "arm64" when builds for simulator)
- set(__iphoneos_archs "arm64")
- #set(__iphonesimulator_archs "arm64,x86_64")
- set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphoneos*] "${__iphoneos_archs}")
- set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphoneos*] "${__iphoneos_archs}")
- #set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
- #set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=iphonesimulator*] "${__iphonesimulator_archs}")
-elseif(CMAKE_SYSTEM_NAME STREQUAL "Android")
+if(CMAKE_SYSTEM_NAME STREQUAL "Android")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC")
endif()
@@ -321,7 +303,7 @@ else()
find_package(Git QUIET)
if(Git_FOUND OR GIT_FOUND)
message(STATUS "Found Git: ${GIT_EXECUTABLE}")
- add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "TESTNET=${TESTNET}" "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+ add_custom_target(version ALL "${CMAKE_COMMAND}" "-D" "VERSION=${VERSION}" "-D" "TESTNET=${TESTNET}" "-D" "GIT=${GIT_EXECUTABLE}" "-D" "TO=${CMAKE_BINARY_DIR}/version/version.h" "-P" "src/version.cmake" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
else()
message(STATUS "WARNING: Git was not found!")
set(VERSION "${VERSION}-unknown")
@@ -338,7 +320,7 @@ if(BUILD_GUI)
"-D" "HTML_DIR=${HTML_CONTENT_HASH_DIR}"
"-D" "TO=${CMAKE_BINARY_DIR}/version/html_content_hash.h"
"-P" "src/gui/qt-daemon/html_content_hash.cmake"
- WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
)
endif()
diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h
index bb21ae99..ced01092 100644
--- a/contrib/epee/include/file_io_utils.h
+++ b/contrib/epee/include/file_io_utils.h
@@ -574,10 +574,10 @@ namespace file_io_utils
try
{
- stdfs::directory_iterator end_itr; // default construction yields past-the-end
- for (stdfs::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr )
+ boost::filesystem::directory_iterator end_itr; // default construction yields past-the-end
+ for ( boost::filesystem::directory_iterator itr( epee::string_encoding::utf8_to_wstring(path) ); itr != end_itr; ++itr )
{
- if ( only_files && stdfs::is_directory(itr->status()) )
+ if ( only_files && boost::filesystem::is_directory(itr->status()) )
{
continue;
}
diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
index 52b429c6..7f7128e8 160000
--- a/src/gui/qt-daemon/layout
+++ b/src/gui/qt-daemon/layout
@@ -1 +1 @@
-Subproject commit 52b429c6f0b40979e543bc57ab911d220b07b83d
+Subproject commit 7f7128e8c3d5c04d801a327a7228abcc9aba85cd
--
2.54.0 (Apple Git-156)
|
