mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-31 07:45:44 +00:00
Cmake build:
Move definitions of target ${_lyx} and ${_tex2lyx} to top-most directory, to make them overall available
This commit is contained in:
parent
2bd5b250c4
commit
81500fc99b
@ -697,6 +697,8 @@ if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
|
|||||||
MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
|
MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
|
||||||
|
set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
|
||||||
add_subdirectory(src "${TOP_BINARY_DIR}/src")
|
add_subdirectory(src "${TOP_BINARY_DIR}/src")
|
||||||
add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
|
add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
|
||||||
add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
|
add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
|
||||||
|
@ -36,7 +36,7 @@ if(Q_WS_X11)
|
|||||||
-DAUTOTEST_ROOT=${TOP_SRC_DIR}/development/autotests
|
-DAUTOTEST_ROOT=${TOP_SRC_DIR}/development/autotests
|
||||||
-DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
|
-DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
|
||||||
-DKEYTEST_INFILE=${_tf}
|
-DKEYTEST_INFILE=${_tf}
|
||||||
-DBINDIR=$<TARGET_FILE_DIR:lyx>
|
-DBINDIR=$<TARGET_FILE_DIR:${_lyx}>
|
||||||
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
|
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
|
||||||
-DKEYTEST_OUTFILE=${_t}-out.txt
|
-DKEYTEST_OUTFILE=${_t}-out.txt
|
||||||
-DPACKAGE=${PACKAGE}
|
-DPACKAGE=${PACKAGE}
|
||||||
@ -53,7 +53,7 @@ foreach(f ${lyx_files})
|
|||||||
add_test(NAME autotests/export_${f}_lyx16
|
add_test(NAME autotests/export_${f}_lyx16
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
||||||
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc
|
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc
|
||||||
-Dlyx=$<TARGET_FILE:lyx>
|
-Dlyx=$<TARGET_FILE:${_lyx}>
|
||||||
-Dformat=lyx16x
|
-Dformat=lyx16x
|
||||||
-Dextension=16.lyx
|
-Dextension=16.lyx
|
||||||
-Dfile=${f}
|
-Dfile=${f}
|
||||||
@ -61,7 +61,7 @@ foreach(f ${lyx_files})
|
|||||||
add_test(NAME autotests/export_${f}_xhtml
|
add_test(NAME autotests/export_${f}_xhtml
|
||||||
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
|
||||||
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc
|
COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc
|
||||||
-Dlyx=$<TARGET_FILE:lyx>
|
-Dlyx=$<TARGET_FILE:${_lyx}>
|
||||||
-Dformat=xhtml
|
-Dformat=xhtml
|
||||||
-Dextension=xhtml
|
-Dextension=xhtml
|
||||||
-Dfile=${f}
|
-Dfile=${f}
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
# Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
|
||||||
#
|
#
|
||||||
|
|
||||||
set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
|
|
||||||
project(${_lyx})
|
project(${_lyx})
|
||||||
|
|
||||||
include_directories(${TOP_SRC_DIR}/src)
|
include_directories(${TOP_SRC_DIR}/src)
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
# Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
|
||||||
#
|
#
|
||||||
|
|
||||||
set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
|
|
||||||
project(${_tex2lyx})
|
project(${_tex2lyx})
|
||||||
|
|
||||||
# There is no header file lengthcommon.h
|
# There is no header file lengthcommon.h
|
||||||
|
Loading…
Reference in New Issue
Block a user