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
|
Description: Boost1.90
Desription: Fix boost1.90 compilation
Bug-Debian: https://bugs.debian.org/1127295
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2026-03-12
--- vera++-1.3.0.orig/src/boost.cmake
+++ vera++-1.3.0/src/boost.cmake
@@ -6,8 +6,10 @@ else()
endif()
mark_as_advanced(VERA_USE_SYSTEM_BOOST)
-set(boostLibs filesystem system program_options regex wave)
+set(boostComponents filesystem program_options regex wave)
+set(boostLibs ${boostComponents})
if(VERA_PYTHON)
+ list(APPEND boostComponents python)
list(APPEND boostLibs python)
endif()
@@ -22,7 +24,7 @@ if(VERA_USE_SYSTEM_BOOST)
# packages with cpack
option(Boost_USE_STATIC_LIBS "Use Boost static libraries" OFF)
endif()
- find_package(Boost COMPONENTS ${boostLibs} REQUIRED)
+ find_package(Boost CONFIG COMPONENTS ${boostComponents} REQUIRED)
include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
link_directories(${Boost_LIBRARY_DIRS})
# hide Boost_DIR option that doesn't seem to be set by FindBoost
@@ -32,6 +34,8 @@ if(VERA_USE_SYSTEM_BOOST)
else()
include(ExternalProject)
+ list(APPEND boostLibs system)
+
set(SOURCEFORGE downloads.sourceforge.net CACHE STRING
"Sourceforge host used to download external projects. Use it to force a specific mirror.")
mark_as_advanced(SOURCEFORGE)
--- vera++-1.3.0.orig/src/executable_path.cpp
+++ vera++-1.3.0/src/executable_path.cpp
@@ -42,7 +42,7 @@ std::string executable_path(const char *
}
boost::filesystem::path full_path(
boost::filesystem::system_complete(
- boost::filesystem::path(buf).normalize()));
+ boost::filesystem::path(buf).lexically_normal()));
return full_path.string();
}
@@ -76,7 +76,7 @@ std::string executable_path(const char *
std::string path(buf, size);
boost::filesystem::path full_path(
boost::filesystem::system_complete(
- boost::filesystem::path(path).normalize()));
+ boost::filesystem::path(path).lexically_normal()));
return full_path.string();
}
@@ -95,7 +95,7 @@ std::string executable_path(const char *
std::string path(buf, size);
boost::filesystem::path full_path(
boost::filesystem::system_complete(
- boost::filesystem::path(path).normalize()));
+ boost::filesystem::path(path).lexically_normal()));
return full_path.string();
}
|
