[geos-commits] r2861 - in trunk: . include/geos

[svn_geos at osgeo.org]

Author: mloskot
Date: 2010-01-16 21:07:10 -0500 (Sat, 16 Jan 2010)
New Revision: 2861

Removed:
   trunk/include/geos/version.h.cmake
Modified:
   trunk/CMakeLists.txt
Log:
Now CMake can generates geos_c.h (#317). Removed include/geos/version.h.cmake as no longer needed - CMake can subsitute variables of Autoconf-style @VAR@ very well.

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2010-01-17 00:46:45 UTC (rev 2860)
+++ trunk/CMakeLists.txt	2010-01-17 02:07:10 UTC (rev 2861)
@@ -113,12 +113,15 @@
 # Setup checks and generate config headers
 #################################################################################
 
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/geos/version.h.cmake 
-  ${CMAKE_CURRENT_BINARY_DIR}/include/geos/version.h)
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/geos/platform.h.cmake 
-  ${CMAKE_CURRENT_BINARY_DIR}/include/geos/platform.h)
+  ${CMAKE_SOURCE_DIR}/include/geos/platform.h)
 
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/geos/version.h.in
+  ${CMAKE_SOURCE_DIR}/include/geos/version.h @ONLY)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/capi/geos_c.h.in
+  ${CMAKE_SOURCE_DIR}/capi/geos_c.h @ONLY)
+
 #################################################################################
 # Configure subdirectories
 #################################################################################

Deleted: trunk/include/geos/version.h.cmake
===================================================================
--- trunk/include/geos/version.h.cmake	2010-01-17 00:46:45 UTC (rev 2860)
+++ trunk/include/geos/version.h.cmake	2010-01-17 02:07:10 UTC (rev 2861)
@@ -1,41 +0,0 @@
-/**********************************************************************
- * $Id$
- *
- * version.h - generated by CMake from version.h.cmake
- *
- * GEOS - Geometry Engine Open Source
- * http://geos.refractions.net
- *
- * Copyright (C) 2009 Mateusz Loskot
- * Copyright (C) 2007 Refractions Research Inc.
- *
- * This is free software; you can redistribute and/or modify it under
- * the terms of the GNU Lesser General Public Licence as published
- * by the Free Software Foundation. 
- * See the COPYING file for more information.
- *
- **********************************************************************/
-#ifndef GEOS_VERSION_H_INCLUDED
-#define GEOS_VERSION_H_INCLUDED
-
-#ifndef GEOS_VERSION_MAJOR
-#define GEOS_VERSION_MAJOR ${VERSION_MAJOR}
-#endif
-
-#ifndef GEOS_VERSION_MINOR
-#define GEOS_VERSION_MINOR ${VERSION_MINOR}
-#endif
-
-#ifndef GEOS_VERSION_PATCH
-#define GEOS_VERSION_PATCH ${VERSION_PATCH}
-#endif
-
-#ifndef GEOS_VERSION
-#define GEOS_VERSION "${VERSION}"
-#endif
-
-#ifndef GEOS_JTS_PORT
-#define GEOS_JTS_PORT "${JTS_PORT}"
-#endif
-
-#endif
\ No newline at end of file