mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Try to make Windows use a versioned directory for the user dir.
(cherry picked from commit 802fd7932b713ee80bf384facd45f45a5ac22de4)
This commit is contained in:
parent
02c4763e66
commit
4478451ea1
@ -476,12 +476,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
|
||||
@ -490,7 +494,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()
|
||||
|
Loading…
Reference in New Issue
Block a user