Revision: 45796
http://brlcad.svn.sourceforge.net/brlcad/?rev=45796&view=rev
Author: starseeker
Date: 2011-08-05 23:19:56 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Let's see if we can do without the tcl_cfg.h hack altogether.
Modified Paths:
--------------
brlcad/trunk/src/other/tcl/CMakeLists.txt
brlcad/trunk/src/other/tcl/generic/tclPkgConfig.c
brlcad/trunk/src/other/tcl/unix/tclUnixInit.c
brlcad/trunk/src/other/tcl/win/tclWinInit.c
Modified: brlcad/trunk/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/tcl/CMakeLists.txt 2011-08-05 23:08:24 UTC (rev
45795)
+++ brlcad/trunk/src/other/tcl/CMakeLists.txt 2011-08-05 23:19:56 UTC (rev
45796)
@@ -169,26 +169,12 @@
INCLUDE(${TCL_SOURCE_DIR}/CMake/tcl.cmake)
#----------------------------------------------------------------------------
-# CMake + Visual Studio doesn't like -D options with spaces, so anything that
-# needs a space will have to be passed via config header.
-SET(TCL_CFG_H_FILE "${TCL_BINARY_DIR}/include/tcl_cfg.h")
-FILE(WRITE ${TCL_CFG_H_FILE} "/**** Variables for Tcl build - replaces -D
options ****/\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define PACKAGE_NAME \"tcl\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define PACKAGE_TARNAME \"tcl\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define PACKAGE_VERSION
\"${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define PACKAGE_STRING \"tcl
${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define TCL_PACKAGE_PATH
\"${CMAKE_INSTALL_PREFIX}/lib\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define TCL_LIBRARY
\"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_LIBDIR
\"${CMAKE_INSTALL_PREFIX}/lib\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_BINDIR
\"${CMAKE_INSTALL_PREFIX}/bin\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_SCRDIR
\"${CMAKE_INSTALL_PREFIX}/scripts\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_INCDIR
\"${CMAKE_INSTALL_PREFIX}/include\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_INSTALL_DOCDIR
\"${CMAKE_INSTALL_PREFIX}/share/man\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_RUNTIME_LIBDIR
\"${CMAKE_INSTALL_PREFIX}/lib\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_RUNTIME_BINDIR
\"${CMAKE_INSTALL_PREFIX}/bin\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_RUNTIME_SCRDIR
\"${CMAKE_INSTALL_PREFIX}/scripts\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_RUNTIME_INCDIR
\"${CMAKE_INSTALL_PREFIX}/include\"\n")
-FILE(APPEND ${TCL_CFG_H_FILE} "#define CFG_RUNTIME_DOCDIR
\"${CMAKE_INSTALL_PREFIX}/share/man\"\n")
+# Define some standard configuration settings passed to all Tcl build targets
+add_definitions(-DPACKAGE_NAME="tcl")
+add_definitions(-DPACKAGE_TARNAME="tcl")
+add_definitions(-DPACKAGE_VERSION="${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
+add_definitions(-DPACKAGE_STRING="tcl
${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
+add_definitions(-DPACKAGE_BUGREPORT="")
# First, get some standard options out of the way - things that are constant
# between various platforms or pertain to specific OS definitions
@@ -632,6 +618,17 @@
generic/tclUniData.c
)
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_LIBDIR="${CMAKE_INSTALL_PREFIX}/lib")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_BINDIR="${CMAKE_INSTALL_PREFIX}/bin")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_SCRDIR="${CMAKE_INSTALL_PREFIX}/scripts")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_INCDIR="${CMAKE_INSTALL_PREFIX}/include")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_INSTALL_DOCDIR="${CMAKE_INSTALL_PREFIX}/share/man")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_LIBDIR="${CMAKE_INSTALL_PREFIX}/lib")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_BINDIR="${CMAKE_INSTALL_PREFIX}/bin")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_SCRDIR="${CMAKE_INSTALL_PREFIX}/scripts")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_INCDIR="${CMAKE_INSTALL_PREFIX}/include")
+SET_PROPERTY(SOURCE generic/tclPkgConfig.c APPEND PROPERTY COMPILE_DEFINITIONS
CFG_RUNTIME_DOCDIR="${CMAKE_INSTALL_PREFIX}/share/man")
+
SET(TCL_STUB_SRCS
generic/tclStubLib.c
)
@@ -742,6 +739,9 @@
unix/tclUnixCompat.c
)
+SET_PROPERTY(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_LIBRARY="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}tcl${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+SET_PROPERTY(SOURCE unix/tclUnixInit.c APPEND PROPERTY COMPILE_DEFINITIONS
TCL_PACKAGE_PATH="${CMAKE_INSTALL_PREFIX}/lib")
+
SET(TCL_NOTIFY_SRCS
unix/tclUnixNotfy.c
)
Modified: brlcad/trunk/src/other/tcl/generic/tclPkgConfig.c
===================================================================
--- brlcad/trunk/src/other/tcl/generic/tclPkgConfig.c 2011-08-05 23:08:24 UTC
(rev 45795)
+++ brlcad/trunk/src/other/tcl/generic/tclPkgConfig.c 2011-08-05 23:19:56 UTC
(rev 45796)
@@ -36,9 +36,6 @@
*/
#include "tclInt.h"
-#ifdef CMAKE_HEADERS
-# include "tcl_cfg.h"
-#endif
/*
* Use C preprocessor statements to define the various values for the embedded
Modified: brlcad/trunk/src/other/tcl/unix/tclUnixInit.c
===================================================================
--- brlcad/trunk/src/other/tcl/unix/tclUnixInit.c 2011-08-05 23:08:24 UTC
(rev 45795)
+++ brlcad/trunk/src/other/tcl/unix/tclUnixInit.c 2011-08-05 23:19:56 UTC
(rev 45796)
@@ -11,9 +11,6 @@
*/
#include "tclInt.h"
-#ifdef CMAKE_HEADERS
-# include "tcl_cfg.h"
-#endif
#include <stddef.h>
#include <locale.h>
#ifdef HAVE_LANGINFO
Modified: brlcad/trunk/src/other/tcl/win/tclWinInit.c
===================================================================
--- brlcad/trunk/src/other/tcl/win/tclWinInit.c 2011-08-05 23:08:24 UTC (rev
45795)
+++ brlcad/trunk/src/other/tcl/win/tclWinInit.c 2011-08-05 23:19:56 UTC (rev
45796)
@@ -14,9 +14,6 @@
*/
#include "tclWinInt.h"
-#ifdef CMAKE_HEADERS
-# include "tcl_cfg.h"
-#endif
#include <winnt.h>
#include <winbase.h>
#include <lmcons.h>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
