Kornel: Moved handling of for lyx2lyx created files to lyx2lyx/CMakeLists.txt

		Installation of executabe lyx2lyx
		creation and installation of lyx2lyx_version.py

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28241 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index d5224fb95923bc7c88f181ebf58acb8e8aec736b..c533b4e528a45dc699ba0084cfdcb3f61e2c3acd 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -335,10 +335,6 @@ configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 find_package(ICONV REQUIRED)
 add_definitions(-DHAVE_ICONV=1)
 
-#TODO: insource is not the best place
-configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in 
-               ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py)
-     
 include_directories(
        ${CMAKE_BINARY_DIR}
        ${TOP_SRC_DIR}/src
@@ -352,10 +348,8 @@ add_subdirectory(src)
 
 add_subdirectory(man)
 add_subdirectory(doc)
-if (UNIX)
-    add_subdirectory(lyx2lyx)
-    add_subdirectory(scripts)
-endif()
+add_subdirectory(lyx2lyx)
+add_subdirectory(scripts)
 
 include(../Install)
 

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index b1111d2c5900809e1ae090d5d8414f242f0a245d..908ecd256530956dce4c59bf3ae621ee4f730973 100755 (executable)
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -18,10 +18,10 @@ macro(lyx_install _parent_src_dir _gl_dir _file_type)
     foreach(_glob_dir ${ARGN})
       file(GLOB _dir_list ${_parent_src_dir}/${_dir}/${_glob_dir})
       if(NOT _dir_list)
-       if(_glob_dir STREQUAL ".")
+        if(_glob_dir STREQUAL ".")
           set(_dir_list ${_parent_src_dir}/${_dir}/.)
-       endif()
-      endif() 
+        endif()
+      endif()
       #message(STATUS "${_dir}/${_glob_dir} -> ${_dir_list} ")
       foreach(_current_dir ${_dir_list})
         file(GLOB _item_list ${_current_dir}/${_file_type})
@@ -78,5 +78,3 @@ lyx_install(${TOP_SRC_DIR}/lib tex          *      .)
 lyx_install(${TOP_SRC_DIR}/lib ui           *      .)
 lyx_install(${TOP_SRC_DIR}/lib .            *      .)
 
-install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)
-

diff --git a/development/cmake/lyx2lyx/CMakeLists.txt b/development/cmake/lyx2lyx/CMakeLists.txt
index c69631a66125ca54cf05d7db71204ac6a3e41242..0240cf085bbdcf85bbd79570099c7e69368e6c73 100644 (file)
--- a/development/cmake/lyx2lyx/CMakeLists.txt
+++ b/development/cmake/lyx2lyx/CMakeLists.txt
@@ -5,7 +5,13 @@
 # Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
 #
 
-set(_project "lyx2lyx")
-include(../PyCompile)
+configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in 
+               ${CMAKE_CURRENT_BINARY_DIR}/lyx2lyx_version.py)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx2lyx_version.py DESTINATION lyx2lyx)
 
+if (UNIX)
+  set(_project "lyx2lyx")
+  include(../PyCompile)
+endif()
 
+install(PROGRAMS ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx DESTINATION lyx2lyx)

diff --git a/development/cmake/scripts/CMakeLists.txt b/development/cmake/scripts/CMakeLists.txt
index 44aa8ac684175e91fbd3156dc510650c47f4c231..5977bc70da1f5f7c13dbe42a0d8c44e43427ea95 100644 (file)
--- a/development/cmake/scripts/CMakeLists.txt
+++ b/development/cmake/scripts/CMakeLists.txt
@@ -5,5 +5,8 @@
 # Copyright (c) 2008, 2009 Kornel Benko, <Kornel.Benko@berlin.de>
 #
 
-set(_project "scripts")
-include(../PyCompile)
+if (UNIX)
+  set(_project "scripts")
+  include(../PyCompile)
+endif()
+