anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try to make Windows use a versioned directory for the user dir.

Browse Source 
(cherry picked from commit 802fd7932b713ee80bf384facd45f45a5ac22de4)
This commit is contained in:
Richard Kimberly Heck 2018-09-29 17:26:14 -04:00
parent 02c4763e66
commit 4478451ea1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -476,12 +476,16 @@ else()
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}") set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
endif() endif()
if(CMAKE_COMPILER_IS_GNUCXX) if(NOT CMAKE_COMPILER_IS_GNUCXX)
message(STATUS "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
set(suffixing ${LYX_PROGRAM_SUFFIX})
else()
# Not a GCC compiler, programs do not have a suffix # Not a GCC compiler, programs do not have a suffix
set(suffixing ${LYX_PACKAGE_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() endif()
# The define PACKAGE below allows lyx-executable to find its default configuration files # The define PACKAGE below allows lyx-executable to find its default configuration files
@ -490,7 +494,6 @@ endif()
# get_default_user_support_dir() # get_default_user_support_dir()
# relative_system_support_dir() # relative_system_support_dir()
# in src/support/Package.cpp # in src/support/Package.cpp
#
if(suffixing) if(suffixing)
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX}) set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
else() else()