From 81500fc99b8a2f28bf429c159713784b1715bc63 Mon Sep 17 00:00:00 2001
From: Kornel Benko <kornel@lyx.org>
Date: Fri, 14 Dec 2012 12:23:17 +0100
Subject: [PATCH] Cmake build: Move definitions of target ${_lyx} and
 ${_tex2lyx} to top-most directory, to make them overall available

---
 CMakeLists.txt                       | 2 ++
 development/autotests/CMakeLists.txt | 6 +++---
 src/CMakeLists.txt                   | 1 -
 src/tex2lyx/CMakeLists.txt           | 1 -
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b2fd243eb..de0b395cb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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}")
 endif()
 
+set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
+set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
 add_subdirectory(src "${TOP_BINARY_DIR}/src")
 add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
 add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
diff --git a/development/autotests/CMakeLists.txt b/development/autotests/CMakeLists.txt
index c79a37db05..7d9a5da9b5 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -36,7 +36,7 @@ if(Q_WS_X11)
         -DAUTOTEST_ROOT=${TOP_SRC_DIR}/development/autotests
         -DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
         -DKEYTEST_INFILE=${_tf}
-        -DBINDIR=$<TARGET_FILE_DIR:lyx>
+        -DBINDIR=$<TARGET_FILE_DIR:${_lyx}>
 	-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
         -DKEYTEST_OUTFILE=${_t}-out.txt
         -DPACKAGE=${PACKAGE}
@@ -53,7 +53,7 @@ foreach(f ${lyx_files})
   add_test(NAME autotests/export_${f}_lyx16
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
     COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc
-            -Dlyx=$<TARGET_FILE:lyx>
+            -Dlyx=$<TARGET_FILE:${_lyx}>
 	    -Dformat=lyx16x
 	    -Dextension=16.lyx
 	    -Dfile=${f}
@@ -61,7 +61,7 @@ foreach(f ${lyx_files})
   add_test(NAME autotests/export_${f}_xhtml
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}"
     COMMAND ${CMAKE_COMMAND} -DLYX_ROOT=${TOP_SRC_DIR}/lib/doc
-            -Dlyx=$<TARGET_FILE:lyx>
+            -Dlyx=$<TARGET_FILE:${_lyx}>
 	    -Dformat=xhtml
 	    -Dextension=xhtml
 	    -Dfile=${f}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dd9a3609ab..4b86fdc426 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@
 # Copyright (c) 2006-2011 Peter Kümmel, <syntheticpp@gmx.net>
 #
 
-set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
 project(${_lyx})
 
 include_directories(${TOP_SRC_DIR}/src)
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 8da2bba15d..bfe3d542af 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -5,7 +5,6 @@
 # Copyright (c) 2008-2011 Kornel Benko, <Kornel.Benko@berlin.de>
 #
 
-set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
 project(${_tex2lyx})
 
 # There is no header file lengthcommon.h