Changeset b6e5dacc in tol for toltcl/generic/toltcl.h

Timestamp:

Feb 10, 2015, 9:48:20 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

cc7ddc7

Parents:

950d323

Message:

refs #1812, refs #1818, compilación basada en CMake, eliminación de warnings, automatización de la regla install.

Configuración en Linux como:

cmake -DCMAKE_TOOLCHAIN_FILE=../linux-i686.toolchain.cmake -DTOL_PREFIX_PATH=/usr/local/tol32 -DCMAKE_BUILD_TYPE=Release -DTCL_LIBRARY=/usr/local/tcl8.5-i686/lib/libtcl8.5.so ..

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6456 be4846ae-f051-483a-831f-b64e7d08527f

File:

• toltcl/generic/toltcl.h (modified) (1 diff)

toltcl/generic/toltcl.h

@@ -27 +27 @@
 #include <tcl.h>
 
+#if defined(__TOLTCL_MAJOR_VERSION__)
+#define TOLTCL_MAJOR_VERSION    __TOLTCL_MAJOR_VERSION__
+#else
+#define TOLTCL_MAJOR_VERSION    3
+#endif
+
+#if defined(__TOLTCL_MINOR_VERSION__)
+#define TOLTCL_MINOR_VERSION    __TOLTCL_MINOR_VERSION__
+#else
+#define TOLTCL_MINOR_VERSION    2
+#endif
+
+#define TOLTCL_TO_STRING0( x ) #x
+#define TOLTCL_TO_STRING(  x )  TOLTCL_TO_STRING0( x )
+
+#ifdef PACKAGE_VERSION
+ #define TOLTCL_VERSION PACKAGE_VERSION
+#else
+
+#define TOLTCL_VERSION TOLTCL_TO_STRING( TOLTCL_MAJOR_VERSION ) "." TOLTCL_TO_STRING( TOLTCL_MINOR_VERSION )
+#endif
+
 /*
  * Windows needs to know which symbols to export. Unix does not.
  * BUILD_TOLTCL should be undefined for Unix.
  */
-
-#define TOLTCL_MAJOR_VERSION    3
-#define TOLTCL_MINOR_VERSION    2
-#ifdef PACKAGE_VERSION
- #define TOLTCL_VERSION PACKAGE_VERSION
-#else
- #define TOLTCL_VERSION          "3.2"
-#endif
 
 #ifdef BUILD_TOLTCL