[Xtrkcad-fork-commits] xtrkcad CMakeLists.txt, 1.11, 1.12 xtrkcad-config.h.in, 1.2, 1.3

[Timothy M. S. <ts...@us...>]

Update of /cvsroot/xtrkcad-fork/xtrkcad
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17483

Modified Files:
	CMakeLists.txt xtrkcad-config.h.in 
Log Message:
COMP: Make it obvious when code is CMake-build-specific, and keep version.h synchronized with the version specified through CMake

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/CMakeLists.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CMakeLists.txt	28 Jan 2008 03:39:09 -0000	1.11
--- CMakeLists.txt	29 Jan 2008 04:10:10 -0000	1.12
***************
*** 62,66 ****
  
  # Enable use of a configuration file ...
! ADD_DEFINITIONS(-DHAVE_CONFIG_H)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrkcad-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/xtrkcad-config.h)
  
--- 62,66 ----
  
  # Enable use of a configuration file ...
! ADD_DEFINITIONS(-DXTRKCAD_CMAKE_BUILD)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/xtrkcad-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/xtrkcad-config.h)
  

Index: xtrkcad-config.h.in
===================================================================
RCS file: /cvsroot/xtrkcad-fork/xtrkcad/xtrkcad-config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** xtrkcad-config.h.in	18 Jan 2008 03:11:49 -0000	1.2
--- xtrkcad-config.h.in	29 Jan 2008 04:10:21 -0000	1.3
***************
*** 2,5 ****
--- 2,25 ----
  #define XTRKCAD_CONFIG_H
  
+ /*  XTrkCad - Model Railroad CAD
+  *  Copyright (C) 2005 Dave Bullis
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+  *  the Free Software Foundation; either version 2 of the License, or
+  *  (at your option) any later version.
+  *
+  *  This program is distributed in the hope that it will be useful,
+  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *  GNU General Public License for more details.
+  *
+  *  You should have received a copy of the GNU General Public License
+  *  along with this program; if not, write to the Free Software
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+ /* Generated file, do not edit! */
+ 
  #cmakedefine XTRKCAD_USE_GETTEXT
  
***************
*** 7,10 ****
--- 27,34 ----
  #define XTRKCAD_LOCALE_DIR "@CMAKE_INSTALL_PREFIX@/@XTRKCAD_LOCALE_INSTALL_DIR@"
  #define XTRKCAD_PACKAGE "@XTRKCAD_PACKAGE@"
+ #define XTRKCAD_VERSION "@XTRKCAD_VERSION@"
+ #define XTRKCAD_PARAMVERSION (10)
+ #define XTRKCAD_PARAMVERSIONVERSION "3.0.0"
+ #define XTRKCAD_MINPARAMVERSION (1)
  
  #endif // !XTRKCAD_CONFIG_H