Cmake build: Refactor determination of destination paths.

This commit is contained in:
Kornel Benko 2016-06-06 08:29:07 +02:00
parent b5c87f2963
commit 06539caccb
4 changed files with 95 additions and 14 deletions

View File

@ -100,6 +100,7 @@ else()
endif() endif()
include(LyXMacros) include(LyXMacros)
include(LyXDestinations)
# Usage LYX_OPTION # Usage LYX_OPTION
# 1. parameter: option name without prefix 'LYX_' # 1. parameter: option name without prefix 'LYX_'
@ -463,13 +464,9 @@ endif()
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
# see http://www.cmake.org/pipermail/cmake/2006-October/011559.html # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
if (UNIX) if (UNIX)
# don't use the default "/usr/local" # use the default "/usr/local"
# but respect the user-choice on the command-line # but respect the user-choice on the command-line
if(LYX_INSTALL_SUFFIX) set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default install prefix" FORCE)
set(CMAKE_INSTALL_PREFIX "/usr/local/lyx${LYX_INSTALL_SUFFIX}" CACHE PATH "LyX default install prefix" FORCE)
else()
set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" CACHE PATH "LyX default install prefix" FORCE)
endif()
endif() endif()
endif() endif()
if(WIN32) if(WIN32)
@ -492,7 +489,7 @@ if(NOT LYX_DATA_SUBDIR)
endif() endif()
set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}") set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
set(LYX_LOCALEDIR "${locale_dir}") 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}")
@ -502,7 +499,7 @@ else()
if(WIN32) if(WIN32)
set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/man1" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man/man1" CACHE STRING "Install location for man pages.")
else() else()
set(LYX_MAN_DIR "/usr/local/man/man1" CACHE STRING "Install location for man pages.") set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man/man1" CACHE STRING "Install location for man pages.")
endif() endif()
endif() endif()
mark_as_advanced(LYX_MAN_DIR) mark_as_advanced(LYX_MAN_DIR)

View File

@ -26,17 +26,14 @@ macro(lyx_install _what _parent_src_dir _gl_dir _file_type)
endif() endif()
# Select installation dir # Select installation dir
if ("${_what}" STREQUAL "data") if ("${_what}" STREQUAL "data")
set(_dest_subdir "${LYX_DATA_SUBDIR}") get_data_destination(_dest_subdir)
elseif ("${_what}" STREQUAL "font") elseif ("${_what}" STREQUAL "font")
set(_dest_subdir "fonts/truetype/${_lyx}/") get_font_destination(_dest_subdir)
elseif ("${_what}" STREQUAL "bin")
set(_dest_subdir "bin/")
elseif ("${_what}" STREQUAL "tex") elseif ("${_what}" STREQUAL "tex")
set(_dest_subdir "texmf/tex/latex/${_lyx}/") get_tex_destination(_dest_subdir)
else() else()
message(FATAL_ERROR "Undefined parameter _what = ${_what} in call to lyx_install") message(FATAL_ERROR "Undefined parameter _what = ${_what} in call to lyx_install")
endif() endif()
#message(STATUS "_dest_subdir = ${_dest_subdir}")
foreach(_dir ${_dirs}) foreach(_dir ${_dirs})
foreach(_glob_dir ${ARGN}) foreach(_glob_dir ${ARGN})
file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir}) file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir})

View File

@ -42,6 +42,7 @@ MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
set(_firstArg ${_firstPoFile}) set(_firstArg ${_firstPoFile})
ENDIF(${_firstPoFile} STREQUAL "ALL") ENDIF(${_firstPoFile} STREQUAL "ALL")
get_locale_destination(LYX_LOCALEDIR)
FOREACH (_currentPoFile ${_firstArg} ${ARGN}) FOREACH (_currentPoFile ${_firstArg} ${ARGN})
GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE) GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH) GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)

View File

@ -0,0 +1,86 @@
# This file is part of lyx.
#
# Helper function to get path to destination directories
#
# Copyright (c) 2016 Kornel Benko <kornel@lyx.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# This file is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with lyx; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# LYX_DATA_SUBDIR is defined in ${TOP_SRC_DIR}/CMakeLists.txt
#
function(get_locale_destination _result)
set(_dir)
if(WIN32)
set(_dir "Resources/locale")
elseif(APPLE)
set(_dir "locale")
elseif(UNIX)
set(_dir "share/locale")
else()
message(FATAL_ERROR "Unhandled platform")
endif()
set(${_result} ${_dir} PARENT_SCOPE)
endfunction()
function(get_data_destination _result)
set(_dir)
if(WIN32)
set(_dir "${LYX_DATA_SUBDIR}")
elseif(APPLE)
set(_dir "${LYX_DATA_SUBDIR}")
elseif(UNIX)
set(_dir "${LYX_DATA_SUBDIR}")
else()
message(FATAL_ERROR "Unhandled platform")
endif()
set(${_result} ${_dir} PARENT_SCOPE)
endfunction()
function(get_font_destination _result)
set(_dir)
if(WIN32)
set(_dir "${LYX_DATA_SUBDIR}fonts/")
elseif(APPLE)
set(_dir "${LYX_DATA_SUBDIR}fonts/")
elseif(UNIX)
set(_dir "fonts/truetype/${_lyx}/")
else()
message(FATAL_ERROR "Unhandled platform")
endif()
set(${_result} ${_dir} PARENT_SCOPE)
endfunction()
function(get_tex_destination _result)
set(_dir)
if(WIN32)
set(_dir "${LYX_DATA_SUBDIR}tex/")
elseif(APPLE)
set(_dir "${LYX_DATA_SUBDIR}tex/")
elseif(UNIX)
set(_dir "texmf/tex/latex/${_lyx}/")
else()
message(FATAL_ERROR "Unhandled platform")
endif()
set(${_result} ${_dir} PARENT_SCOPE)
endfunction()