From f93bb283d5f24a840fa4db246ba9b58605d3d6dd Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Mon, 18 Aug 2014 02:00:40 +0000 Subject: [PATCH] For builds not using cmake, generate fg_version.h to match cmake-specified version number. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1696 7f0cb862-5218-0410-a997-914c9d46530a --- CMakeLists.txt | 2 ++ config.h.in | 5 ----- src/fg_internal.h | 2 ++ src/fg_version.h | 47 +++++++++++++++++++++++++++++++++++++++++++++++ src/fg_version.h.in | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 src/fg_version.h create mode 100644 src/fg_version.h.in diff --git a/CMakeLists.txt b/CMakeLists.txt index d45b9a5..7cd2afc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,8 @@ set(VERSION_MAJOR 3) set(VERSION_MINOR 0) set(VERSION_PATCH 0) +# Update fg_version.h to match the versions number here in cmake +CONFIGURE_FILE(src/fg_version.h.in src/fg_version.h) # FREEGLUT_BUILD_SHARED_LIBS is already a standard CMake variable, but we need to # re-declare it here so it will show up in the GUI. diff --git a/config.h.in b/config.h.in index 16c39c3..7da6007 100644 --- a/config.h.in +++ b/config.h.in @@ -19,11 +19,6 @@ #cmakedefine HAVE_ULONG_LONG #cmakedefine HAVE_U__INT64 -/* version numbers */ -#define VERSION_MAJOR @VERSION_MAJOR@ -#define VERSION_MINOR @VERSION_MINOR@ -#define VERSION_PATCH @VERSION_PATCH@ - /* warning and errors printed? */ #cmakedefine FREEGLUT_PRINT_WARNINGS #cmakedefine FREEGLUT_PRINT_ERRORS diff --git a/src/fg_internal.h b/src/fg_internal.h index 6698865..5e35378 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -32,6 +32,8 @@ # include "config.h" #endif +#include "fg_version.h" + /* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */ /* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined? * XXX: If so, remove the first set of defined()'s below. diff --git a/src/fg_version.h b/src/fg_version.h new file mode 100644 index 0000000..20bed2f --- /dev/null +++ b/src/fg_version.h @@ -0,0 +1,47 @@ +/* + * fg_version.h + * + * The freeglut library private include file. + * + * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. + * Written by Pawel W. Olszta, + * Creation date: Thu Dec 2 1999 + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef FREEGLUT_VERSION_H +#define FREEGLUT_VERSION_H + +/* Ordinarily it's cmake's job to update fg_version.h, + * edit CMakeLists.txt rather than this file directly. + */ + +#ifndef VERSION_MAJOR +#define VERSION_MAJOR 3 +#endif + +#ifndef VERSION_MINOR +#define VERSION_MINOR 0 +#endif + +#ifndef VERSION_PATCH +#define VERSION_PATCH 0 +#endif + +#endif diff --git a/src/fg_version.h.in b/src/fg_version.h.in new file mode 100644 index 0000000..45b489a --- /dev/null +++ b/src/fg_version.h.in @@ -0,0 +1,47 @@ +/* + * fg_version.h + * + * The freeglut library private include file. + * + * Copyright (c) 1999-2000 Pawel W. Olszta. All Rights Reserved. + * Written by Pawel W. Olszta, + * Creation date: Thu Dec 2 1999 + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * PAWEL W. OLSZTA BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef FREEGLUT_VERSION_H +#define FREEGLUT_VERSION_H + +/* Ordinarily it's cmake's job to update fg_version.h, + * edit CMakeLists.txt rather than this file directly. + */ + +#ifndef VERSION_MAJOR +#define VERSION_MAJOR @VERSION_MAJOR@ +#endif + +#ifndef VERSION_MINOR +#define VERSION_MINOR @VERSION_MINOR@ +#endif + +#ifndef VERSION_PATCH +#define VERSION_PATCH @VERSION_PATCH@ +#endif + +#endif -- 1.7.10.4