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

Cmake build: Prevent multiple configuration runs

Browse Source 
Normally the sequence to compile is
1.) cmake <source> <some parameters>
2.) make

but since 'unset(var CACHE)' changed the cache, the following call to 'make'
triggered the configuration run.
This commit is contained in:
Kornel Benko 2020-04-17 12:13:08 +02:00
parent d9b884341c
commit 5ec95f703c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -580,18 +580,22 @@ get_locale_destination(LYX_LOCALEDIR)
set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}") set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}") set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
unset(LYX_MAN_DIR CACHE)
if(LYX_BUNDLE AND APPLE) if(LYX_BUNDLE AND APPLE)
set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR_tmp "${LYX_DATA_SUBDIR}")
else() else()
if(WIN32) if(WIN32)
set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR_tmp "${CMAKE_BINARY_DIR}/usr/local/man/")
elseif(UNIX) elseif(UNIX)
set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man/" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR_tmp "${CMAKE_INSTALL_PREFIX}/share/man/")
else() else()
set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR_tmp "${CMAKE_INSTALL_PREFIX}/man/")
endif() endif()
endif() endif()
if (NOT LYX_MAN_DIR_tmp EQUAL "${LYX_MAN_DIR}")
unset(LYX_MAN_DIR CACHE)
set(LYX_MAN_DIR "${LYX_MAN_DIR_tmp}" CACHE STRING "Install location for man pages.")
endif()
unset(LYX_MAN_DIR_tmp)
mark_as_advanced(LYX_MAN_DIR) mark_as_advanced(LYX_MAN_DIR)
# The Win installer cannot be built by CMake because one needs to install plugins for NSIS # The Win installer cannot be built by CMake because one needs to install plugins for NSIS