commit 1ae013f816de562a4181696d32186d0845835748
Author: Richard Kimberly Heck <rikih...@lyx.org>
Date: Sat Sep 29 17:26:14 2018 -0400
Try to make Windows use a versioned directory for the user dir.
(cherry picked from commit 802fd7932b713ee80bf384facd45f45a5ac22de4)
(cherry picked from commit 4478451ea164a4de891b1d26ad3b1c04ad770337)
---
CMakeLists.txt | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 63b4ea2..d36eb71 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -461,12 +461,16 @@ else()
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
endif()
-if(CMAKE_COMPILER_IS_GNUCXX)
- message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
- set(suffixing ${LYX_PROGRAM_SUFFIX})
-else()
+if(NOT CMAKE_COMPILER_IS_GNUCXX)
# Not a GCC compiler, programs do not have a suffix
set(suffixing ${LYX_PACKAGE_SUFFIX})
+elseif(WIN32 AND MINGW)
+ # We want to use a suffix for the package in this case,
+ # even if not for the program
+ set(suffixing ${LYX_PACKAGE_SUFFIX})
+else()
+ message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
+ set(suffixing ${LYX_PROGRAM_SUFFIX})
endif()
# The define PACKAGE below allows lyx-executable to find its default
configuration files
@@ -475,7 +479,6 @@ endif()
# get_default_user_support_dir()
# relative_system_support_dir()
# in src/support/Package.cpp
-#
if(suffixing)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
else()
