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

Cmake build: Initialize some variables before use.

Browse Source
This commit is contained in:
Kornel Benko 2015-12-09 15:37:58 +01:00
parent f3cdf74e68
commit a9764cf191
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
development/autotests/ExportTests.cmake
View File

@ -36,6 +36,14 @@ else()
set(PDF_FORMATS "pdf" "pdf2" "pdf3") set(PDF_FORMATS "pdf" "pdf2" "pdf3")
endif() endif()
set(potential_languages "ca" "cs" "da" "de" "el" "es" "eu" "fa" "fr" "gl" "he" "hu" "id" "it" "ja" "ko" "nb" "nl" "pl" "pt" "ro" "ru" "sk" "sl" "sr" "sv" "uk" "zh_CN")
macro(initLangVars varname)
foreach(_l ${potential_languages})
set(${varname}_${_l})
endforeach()
endmacro()
macro(getoutputformats filepath varname) macro(getoutputformats filepath varname)
file(STRINGS "${filepath}" lines) file(STRINGS "${filepath}" lines)
# What should we test, if default_output_format is not defined? # What should we test, if default_output_format is not defined?
@ -164,6 +172,8 @@ endmacro()
macro(loadTestList filename resList depth) macro(loadTestList filename resList depth)
# Create list of strings from a file without comments # Create list of strings from a file without comments
# ENCODING parameter is a new feature in cmake 3.1 # ENCODING parameter is a new feature in cmake 3.1
initLangVars(${resList})
initLangVars("sublabel")
if (CMAKE_VERSION VERSION_GREATER "3.1") if (CMAKE_VERSION VERSION_GREATER "3.1")
file(STRINGS ${filename} tempList ENCODING "UTF-8") file(STRINGS ${filename} tempList ENCODING "UTF-8")
else() else()

4
development/cmake/modules/LyXMacros.cmake
View File

@ -104,7 +104,9 @@ macro(LYX_AUTOMOC)
set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC}) set(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
if (WIN32) if (WIN32)
set(_def -D_WIN32) set(_def -D_WIN32)
else()
set(_def)
endif() endif()
#set(_moc ${_abs_PATH}/${_current_MOC}) #set(_moc ${_abs_PATH}/${_current_MOC})
add_custom_command(OUTPUT ${_moc} add_custom_command(OUTPUT ${_moc}