- use version.C.in file instead of a simple copy

- generate lyx2lyx_version.py

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index ec7438de491635680c2bbd48112914b056ac03a7..b51d1f8f498e0c73ea639045c74380931d23009d 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -11,6 +11,9 @@ set (EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
 
 set(PACKAGE lyx)
 set(PACKAGE_VERSION 1.5.0svn)
+set(LYX_DATE "not released yet")
+#TODO
+set(VERSION_INFO "CMake Build")
 
 if(WIN32)
        set(USE_WINDOWS_PACKAGING 1)
@@ -101,6 +104,10 @@ else(MSVC)
        add_definitions(-DBOOST_USER_CONFIG="<config.h>")
 endif(MSVC)
 
+
+#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} 

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 0d2287393524f15330d9fac8fcb584e03c19f655..c33bae3a3996f8bfe7a4d42ec6f1e0f01e106c71 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -16,7 +16,7 @@ add_subdirectory(support)
 #add_subdirectory(tex2lyx) 
 
 
-configure_file(version.C.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.C)
+configure_file(${TOP_SRC_DIR}/src/version.C.in ${CMAKE_CURRENT_BINARY_DIR}/version.C)
 
 file(GLOB lyx_sources ${TOP_SRC_DIR}/src/*.C)
 file(GLOB lyx_headers ${TOP_SRC_DIR}/src/*.h)

diff --git a/development/cmake/src/version.C.cmake b/development/cmake/src/version.C.cmake
deleted file mode 100644 (file)
index 7e5e469..0000000
--- a/development/cmake/src/version.C.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- C++ -*- */
-/**
- * \file version.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Jean-Marc Lasgouttes
- *
- * Full author contact details are available in file CREDITS.
- *
- * Warning! This file is autogenerated from version.C.in.
- * All changes to this file will be lost.
- */
-
-///
-char const * lyx_version = "@PACKAGE_VERSION@";
-///
-char const * lyx_release_date = "Thu, Jan 30, 2003";
-
-/// This is the version information shown by 'lyx -version'
-char const * lyx_version_info = "@VERSION_INFO@";