75 lines
2.1 KiB
Diff
75 lines
2.1 KiB
Diff
From 363e5f62eff8f0068b85ef6273d9d3f7434e3e58 Mon Sep 17 00:00:00 2001
|
|
From: StableAgOH <stagoh17@gmail.com>
|
|
Date: Thu, 19 Oct 2023 03:11:23 +0800
|
|
Subject: [PATCH 1/3] fix cmake install
|
|
|
|
---
|
|
CMakeLists.txt | 4 ++--
|
|
docs/CMakeLists.txt | 2 +-
|
|
share/CMakeLists.txt | 2 +-
|
|
src/CMakeLists.txt | 2 +-
|
|
4 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 34e15857..dd54ec2e 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -425,13 +425,13 @@ if(WIN32)
|
|
endif()
|
|
endif()
|
|
|
|
-if(APPLE AND WITH_APP_BUNDLE OR WIN32)
|
|
+if(APPLE AND WITH_APP_BUNDLE OR MSVC)
|
|
set(PROGNAME KeePassXC)
|
|
else()
|
|
set(PROGNAME keepassxc)
|
|
endif()
|
|
|
|
-if(WIN32)
|
|
+if(MSVC)
|
|
set(CLI_INSTALL_DIR ".")
|
|
set(PROXY_INSTALL_DIR ".")
|
|
set(BIN_INSTALL_DIR ".")
|
|
diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
|
|
index db54e578..e03a2bd3 100644
|
|
--- a/docs/CMakeLists.txt
|
|
+++ b/docs/CMakeLists.txt
|
|
@@ -44,7 +44,7 @@ install(FILES
|
|
DESTINATION ${DATA_INSTALL_DIR}/docs)
|
|
|
|
# Build Man Pages on Linux and macOS
|
|
-if(UNIX)
|
|
+if(UNIX OR MINGW)
|
|
add_custom_command(OUTPUT keepassxc.1 keepassxc-cli.1
|
|
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ./man/keepassxc.1.adoc
|
|
COMMAND ${ASCIIDOCTOR_EXE} -D ${OUT_DIR} -b manpage ${REV} ./man/keepassxc-cli.1.adoc
|
|
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
|
|
index 90f7e6e6..48e2a0e8 100644
|
|
--- a/share/CMakeLists.txt
|
|
+++ b/share/CMakeLists.txt
|
|
@@ -66,7 +66,7 @@ if(APPLE)
|
|
install(FILES macosx/keepassxc.icns DESTINATION ${DATA_INSTALL_DIR})
|
|
endif()
|
|
|
|
-if(WIN32)
|
|
+if(MSVC)
|
|
install(FILES windows/qt.conf DESTINATION ${BIN_INSTALL_DIR})
|
|
endif()
|
|
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 5ead1864..d28e07fe 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -421,7 +421,7 @@ install(TARGETS ${PROGNAME}
|
|
BUNDLE DESTINATION . COMPONENT Runtime
|
|
RUNTIME DESTINATION ${BIN_INSTALL_DIR} COMPONENT Runtime)
|
|
|
|
-if(WIN32)
|
|
+if(MSVC)
|
|
if(${CMAKE_SIZEOF_VOID_P} EQUAL "8")
|
|
set(OUTPUT_FILE_POSTFIX "Win64")
|
|
else()
|
|
--
|
|
2.42.0.windows.1
|
|
|