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
|
From: Steve Robbins <steve@sumost.ca>
Date: Sun, 17 Aug 2025 20:41:54 -0500
Subject: Build using C++-17; googletest no longer supports lower standards.
---
CMakeLists.txt | 2 +-
Makefile.linux | 1 -
src/test/Makefile | 2 +-
src/ui/cli/Makefile | 1 -
4 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3776a9b..65fd662 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
# 3.0.5 is fine, though...
# Need to revisit this and remove when no longer an issue
if (NOT WIN32 OR WX_WINDOWS)
- set(CMAKE_CXX_STANDARD 14)
+ set(CMAKE_CXX_STANDARD 17)
else (NOT WIN32 OR WX_WINDOWS)
set(CMAKE_CXX_STANDARD 17)
endif (NOT WIN32 OR WX_WINDOWS)
diff --git a/Makefile.linux b/Makefile.linux
index 616919e..97fabeb 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -43,7 +43,6 @@ SF_UPLOAD_CMD := /usr/bin/rsync -avP -e ssh
SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEASENUM)
RELTAG = wx$(subst .,_,$(RELEASENAME))
-export CPPFLAGS += -std=c++11
all:
@echo "Toplevel make is no longer supported for building Linux versions of PasswordSafe. Please use cmake as described in README.LINUX.DEVELOPERS.md"
diff --git a/src/test/Makefile b/src/test/Makefile
index df5c73c..0fefb17 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -39,7 +39,7 @@ TESTOBJ = $(addprefix $(OBJPATH)/,$(subst .cpp,.o,$(TESTSRC)))
TEST = $(BINPATH)/coretest
OBJS = $(TESTOBJ) $(GTEST_OBJ)
-CXXFLAGS += -DUNICODE -Wall -I$(INCPATH) -I$(INCPATH)/core -std=c++11
+CXXFLAGS += -DUNICODE -Wall -I$(INCPATH) -I$(INCPATH)/core
LDFLAGS += -L$(LIBPATH) -lcore -los -luuid -lxerces-c -pthread -lX11 -lXtst -lmagic
ifeq ($(CONFIG),debug)
diff --git a/src/ui/cli/Makefile b/src/ui/cli/Makefile
index 29990a4..8e6bd6d 100644
--- a/src/ui/cli/Makefile
+++ b/src/ui/cli/Makefile
@@ -25,7 +25,6 @@ LIBCORE = $(LIBPATH)/libcore.a
LIBOS = $(LIBPATH)/libos.a
LIBS = $(LIBCORE) $(LIBOS)
-export CPPFLAGS += -std=c++11
ifeq ($(findstring Darwin, $(shell uname -s)), Darwin)
XERCESCPPFLAGS=
PLATFORM=mac
|
