|
 |
45c5bd |
diff --git a/nowide/CMakeLists.txt b/nowide/CMakeLists.txt
|
|
|
45c5bd |
index ff9dba6..5d1b9ce 100644
|
|
|
45c5bd |
--- a/nowide/CMakeLists.txt
|
|
|
45c5bd |
+++ b/nowide/CMakeLists.txt
|
|
|
45c5bd |
@@ -1,7 +1,5 @@
|
|
|
45c5bd |
find_package(Boost 1.54 REQUIRED)
|
|
|
45c5bd |
|
|
|
45c5bd |
-add_leatherman_includes(${Boost_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../vendor/nowide/include")
|
|
|
45c5bd |
-add_leatherman_headers(../vendor/nowide/include/boost)
|
|
|
45c5bd |
if(WIN32)
|
|
|
45c5bd |
add_leatherman_library(../vendor/nowide/src/iostream.cpp)
|
|
|
45c5bd |
endif()
|
|
|
45c5bd |
--- leatherman-1.10.0/execution/CMakeLists.txt~ 2020-06-03 10:30:05.027479897 +0100
|
|
|
45c5bd |
+++ leatherman-1.10.0/execution/CMakeLists.txt 2020-06-03 10:30:18.871483297 +0100
|
|
|
45c5bd |
@@ -1,4 +1,4 @@
|
|
|
45c5bd |
-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
|
|
|
45c5bd |
+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
|
|
|
45c5bd |
|
|
|
45c5bd |
add_leatherman_deps("${Boost_LIBRARIES}")
|
|
|
45c5bd |
if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
|
|
|
45c5bd |
@@ -10,7 +10,6 @@
|
|
|
45c5bd |
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
|
|
45c5bd |
|
|
|
45c5bd |
leatherman_dependency(util)
|
|
|
45c5bd |
-leatherman_dependency(nowide)
|
|
|
45c5bd |
leatherman_dependency(locale)
|
|
|
45c5bd |
leatherman_dependency(logging)
|
|
|
45c5bd |
leatherman_dependency(file_util)
|
|
|
45c5bd |
--- leatherman-1.10.0/file_util/CMakeLists.txt~ 2020-06-03 10:30:05.031479898 +0100
|
|
|
45c5bd |
+++ leatherman-1.10.0/file_util/CMakeLists.txt 2020-06-03 10:31:04.550494516 +0100
|
|
|
45c5bd |
@@ -1,9 +1,8 @@
|
|
|
45c5bd |
-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
|
|
|
45c5bd |
+find_package(Boost 1.73 REQUIRED COMPONENTS regex filesystem system nowide)
|
|
|
45c5bd |
|
|
|
45c5bd |
add_leatherman_deps("${Boost_LIBRARIES}")
|
|
|
45c5bd |
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
|
|
45c5bd |
|
|
|
45c5bd |
-leatherman_dependency(nowide)
|
|
|
45c5bd |
leatherman_dependency(locale)
|
|
|
45c5bd |
leatherman_dependency(logging)
|
|
|
45c5bd |
leatherman_dependency(util)
|
|
|
45c5bd |
--- leatherman-1.10.0/logging/CMakeLists.txt~ 2020-06-03 10:30:05.035479898 +0100
|
|
|
45c5bd |
+++ leatherman-1.10.0/logging/CMakeLists.txt 2020-06-03 10:30:19.092483352 +0100
|
|
|
45c5bd |
@@ -4,7 +4,6 @@
|
|
|
45c5bd |
add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
|
|
45c5bd |
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
|
|
45c5bd |
|
|
|
45c5bd |
-leatherman_dependency(nowide)
|
|
|
45c5bd |
leatherman_dependency(locale)
|
|
|
45c5bd |
|
|
|
45c5bd |
if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
|
|
|
45c5bd |
--- leatherman-1.10.0/tests/CMakeLists.txt~ 2020-06-02 23:24:17.146002133 +0100
|
|
|
45c5bd |
+++ leatherman-1.10.0/tests/CMakeLists.txt 2020-06-02 23:26:17.780054923 +0100
|
|
|
45c5bd |
@@ -1,8 +1,8 @@
|
|
|
45c5bd |
-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
|
|
|
45c5bd |
+set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex nowide)
|
|
|
45c5bd |
if (LEATHERMAN_USE_LOCALES)
|
|
|
45c5bd |
set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
|
|
|
45c5bd |
endif()
|
|
|
45c5bd |
-find_package(Boost "1.54" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
|
|
|
45c5bd |
+find_package(Boost "1.73" REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS})
|
|
|
45c5bd |
|
|
|
45c5bd |
include_directories(BEFORE ${LEATHERMAN_CATCH_INCLUDE} ${LEATHERMAN_INCLUDE_DIRS})
|
|
|
45c5bd |
add_executable(leatherman_test main.cc ${LEATHERMAN_TEST_SRCS})
|
|
|
45c5bd |
--- leatherman-1.10.0/util/CMakeLists.txt~ 2020-06-03 10:05:44.277172451 +0100
|
|
|
45c5bd |
+++ leatherman-1.10.0/util/CMakeLists.txt 2020-06-03 10:06:52.969185017 +0100
|
|
|
45c5bd |
@@ -1,10 +1,8 @@
|
|
|
45c5bd |
-find_package(Boost 1.54 REQUIRED date_time chrono system)
|
|
|
45c5bd |
+find_package(Boost 1.73 REQUIRED date_time chrono system nowide)
|
|
|
45c5bd |
|
|
|
45c5bd |
add_leatherman_deps(${Boost_LIBRARIES})
|
|
|
45c5bd |
add_leatherman_includes("${Boost_INCLUDE_DIRS}")
|
|
|
45c5bd |
|
|
|
45c5bd |
-leatherman_dependency(nowide)
|
|
|
45c5bd |
-
|
|
|
45c5bd |
if(WIN32)
|
|
|
45c5bd |
set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")
|
|
|
45c5bd |
set(PLATFORM_TESTS "tests/windows/environment.cc")
|
|
|
45c5bd |
--- leatherman-1.10.0/file_util/src/file.cc~ 2019-12-14 20:46:29.000000000 +0000
|
|
|
45c5bd |
+++ leatherman-1.10.0/file_util/src/file.cc 2020-06-02 22:42:45.100963441 +0100
|
|
|
45c5bd |
@@ -1,6 +1,6 @@
|
|
|
45c5bd |
#include <leatherman/file_util/file.hpp>
|
|
|
45c5bd |
#include <boost/nowide/fstream.hpp>
|
|
|
45c5bd |
-#include <boost/nowide/cenv.hpp>
|
|
|
45c5bd |
+#include <boost/nowide/cstdlib.hpp>
|
|
|
45c5bd |
#include <boost/filesystem.hpp>
|
|
|
45c5bd |
#include <sstream>
|
|
|
45c5bd |
#include <leatherman/logging/logging.hpp>
|
|
|
45c5bd |
--- leatherman-1.10.0/util/src/environment.cc~ 2019-12-14 20:46:29.000000000 +0000
|
|
|
45c5bd |
+++ leatherman-1.10.0/util/src/environment.cc 2020-06-02 22:42:45.101963441 +0100
|
|
|
45c5bd |
@@ -1,5 +1,5 @@
|
|
|
45c5bd |
#include <leatherman/util/environment.hpp>
|
|
|
45c5bd |
-#include <boost/nowide/cenv.hpp>
|
|
|
45c5bd |
+#include <boost/nowide/cstdlib.hpp>
|
|
|
45c5bd |
|
|
|
45c5bd |
using namespace std;
|
|
|
45c5bd |
|
|
|
45c5bd |
--- leatherman-1.10.0/util/tests/environment.cc~ 2019-12-14 20:46:29.000000000 +0000
|
|
|
45c5bd |
+++ leatherman-1.10.0/util/tests/environment.cc 2020-06-02 22:42:45.103963442 +0100
|
|
|
45c5bd |
@@ -1,6 +1,6 @@
|
|
|
45c5bd |
#include <catch.hpp>
|
|
|
45c5bd |
#include <leatherman/util/environment.hpp>
|
|
|
45c5bd |
-#include <boost/nowide/cenv.hpp>
|
|
|
45c5bd |
+#include <boost/nowide/cstdlib.hpp>
|
|
|
45c5bd |
|
|
|
45c5bd |
using namespace std;
|
|
|
45c5bd |
using namespace leatherman::util;
|