Revision: 42389
http://brlcad.svn.sourceforge.net/brlcad/?rev=42389&view=rev
Author: starseeker
Date: 2011-01-17 14:14:44 +0000 (Mon, 17 Jan 2011)
Log Message:
-----------
Wrap the CMake generated headers in a define that is only set in the CMake
build.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
brlcad/branches/cmake/src/other/tcl/generic/tclPkgConfig.c
brlcad/branches/cmake/src/other/tcl/unix/tclUnixInit.c
brlcad/branches/cmake/src/other/tcl/win/tclWinInit.c
brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
brlcad/branches/cmake/src/other/tktable/generic/tkTable.c
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2011-01-17 14:13:51 UTC
(rev 42388)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2011-01-17 14:14:44 UTC
(rev 42389)
@@ -142,6 +142,7 @@
# First, get some standard options out of the way - things that are constant
# between various platforms or pertain to specific OS definitions
SET(TCL_CFLAGS "${TCL_CFLAGS} -DSTDC_HEADERS=1")
+SET(TCL_CFLAGS "${TCL_CFLAGS} -DCMAKE_HEADERS=1")
SET(TCL_CFLAGS "${TCL_CFLAGS}
-DTCL_SHLIB_EXT=\\\"${CMAKE_SHARED_LIBRARY_SUFFIX}\\\"")
# Windows specific flags
Modified: brlcad/branches/cmake/src/other/tcl/generic/tclPkgConfig.c
===================================================================
--- brlcad/branches/cmake/src/other/tcl/generic/tclPkgConfig.c 2011-01-17
14:13:51 UTC (rev 42388)
+++ brlcad/branches/cmake/src/other/tcl/generic/tclPkgConfig.c 2011-01-17
14:14:44 UTC (rev 42389)
@@ -36,7 +36,9 @@
*/
#include "tclInt.h"
-#include "tcl_cfg.h"
+#ifdef CMAKE_HEADERS
+# include "tcl_cfg.h"
+#endif
/*
* Use C preprocessor statements to define the various values for the embedded
Modified: brlcad/branches/cmake/src/other/tcl/unix/tclUnixInit.c
===================================================================
--- brlcad/branches/cmake/src/other/tcl/unix/tclUnixInit.c 2011-01-17
14:13:51 UTC (rev 42388)
+++ brlcad/branches/cmake/src/other/tcl/unix/tclUnixInit.c 2011-01-17
14:14:44 UTC (rev 42389)
@@ -11,7 +11,9 @@
*/
#include "tclInt.h"
-#include "tcl_cfg.h"
+#ifdef CMAKE_HEADERS
+# include "tcl_cfg.h"
+#endif
#include <stddef.h>
#include <locale.h>
#ifdef HAVE_LANGINFO
Modified: brlcad/branches/cmake/src/other/tcl/win/tclWinInit.c
===================================================================
--- brlcad/branches/cmake/src/other/tcl/win/tclWinInit.c 2011-01-17
14:13:51 UTC (rev 42388)
+++ brlcad/branches/cmake/src/other/tcl/win/tclWinInit.c 2011-01-17
14:14:44 UTC (rev 42389)
@@ -14,7 +14,9 @@
*/
#include "tclWinInt.h"
-#include "tcl_cfg.h"
+#ifdef CMAKE_HEADERS
+# include "tcl_cfg.h"
+#endif
#include <winnt.h>
#include <winbase.h>
#include <lmcons.h>
Modified: brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-17
14:13:51 UTC (rev 42388)
+++ brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-17
14:14:44 UTC (rev 42389)
@@ -55,6 +55,7 @@
add_definitions(
-DSTDC_HEADERS=1
+ -DCMAKE_HEADERS=1
)
add_library(Tktable SHARED ${TKTABLE_SRCS})
Modified: brlcad/branches/cmake/src/other/tktable/generic/tkTable.c
===================================================================
--- brlcad/branches/cmake/src/other/tktable/generic/tkTable.c 2011-01-17
14:13:51 UTC (rev 42388)
+++ brlcad/branches/cmake/src/other/tktable/generic/tkTable.c 2011-01-17
14:14:44 UTC (rev 42389)
@@ -22,7 +22,9 @@
* RCS: @(#) $Id: tkTable.c,v 1.34 2008/11/14 23:43:35 hobbs Exp $
*/
-#include "tktable_cfg.h"
+#ifdef CMAKE_HEADERS
+# include "tktable_cfg.h"
+#endif
#include "tkTable.h"
#ifdef DEBUG
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
