Revision: 42157
http://brlcad.svn.sourceforge.net/brlcad/?rev=42157&view=rev
Author: starseeker
Date: 2011-01-12 18:48:04 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
more -D elimination - a lot of these defines probably aren't even needed in
CMake builds, as they don't seem to be used by the C code and CMake is handling
the generation of whatever config files are needed itself... for the ones that
are, the only code change is to include the generated header. Definitely more
cleanup to do on these to reduce the build logic to the functioning minimum.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
brlcad/branches/cmake/src/other/tk/CMakeLists.txt
brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
brlcad/branches/cmake/src/other/tktable/generic/tkTable.c
Modified: brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2011-01-12
18:34:55 UTC (rev 42156)
+++ brlcad/branches/cmake/src/other/incrTcl/itcl/CMakeLists.txt 2011-01-12
18:48:04 UTC (rev 42157)
@@ -108,11 +108,6 @@
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_NAME=\\\"itcl\\\"")
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_TARNAME=\\\"itcl\\\"")
SET(ITCL_CFLAGS "${ITCL_CFLAGS}
-DPACKAGE_VERSION=\\\"${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}\\\"")
-IF(NOT WIN32)
-SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_STRING=\\\"itcl\\\
${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}\\\"")
-ELSE(NOT WIN32)
-SET(ITCL_CFLAGS "${ITCL_CFLAGS}
-DPACKAGE_STRING=\\\"itcl_${ITCL_MAJOR_VERSION}.${ITCL_MINOR_VERSION}\\\"")
-ENDIF(NOT WIN32)
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
SET(ITCL_CFLAGS "${ITCL_CFLAGS} -DSTDC_HEADERS=1")
Modified: brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2011-01-12
18:34:55 UTC (rev 42156)
+++ brlcad/branches/cmake/src/other/incrTcl/itk/CMakeLists.txt 2011-01-12
18:48:04 UTC (rev 42157)
@@ -108,11 +108,6 @@
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_NAME=\\\"itk\\\"")
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_TARNAME=\\\"itk\\\"")
SET(ITK_CFLAGS "${ITK_CFLAGS}
-DPACKAGE_VERSION=\\\"${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}\\\"")
-IF(NOT WIN32)
-SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_STRING=\\\"itk\\\
${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}\\\"")
-ELSE(NOT WIN32)
-SET(ITK_CFLAGS "${ITK_CFLAGS}
-DPACKAGE_STRING=\\\"itk_${ITK_MAJOR_VERSION}.${ITK_MINOR_VERSION}\\\"")
-ENDIF(NOT WIN32)
SET(ITK_CFLAGS "${ITK_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
SET(ITK_CFLAGS "${ITK_CFLAGS} -DSTDC_HEADERS=1")
Modified: brlcad/branches/cmake/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-12 18:34:55 UTC
(rev 42156)
+++ brlcad/branches/cmake/src/other/tk/CMakeLists.txt 2011-01-12 18:48:04 UTC
(rev 42157)
@@ -113,9 +113,6 @@
SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_NAME=\\\"tk\\\"")
SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_TARNAME=\\\"tk\\\"")
SET(TK_CFLAGS "${TK_CFLAGS}
-DPACKAGE_VERSION=\\\"${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}\\\"")
-IF(NOT WIN32)
- SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_STRING=\\\"tk\\
${TK_VERSION_MAJOR}.${TK_VERSION_MINOR}\\\"")
-ENDIF(NOT WIN32)
SET(TK_CFLAGS "${TK_CFLAGS} -DPACKAGE_BUGREPORT=\\\"\\\"")
SET(TK_CFLAGS "${TK_CFLAGS} -DSTDC_HEADERS=1")
Modified: brlcad/branches/cmake/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-12
18:34:55 UTC (rev 42156)
+++ brlcad/branches/cmake/src/other/tktable/CMakeLists.txt 2011-01-12
18:48:04 UTC (rev 42157)
@@ -45,13 +45,16 @@
generic/tkTableWin.c
)
+SET(TKTABLE_CFG_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/tktable_cfg.h)
+FILE(WRITE ${TKTABLE_CFG_H_FILE} "/**** Variables for Tktable build - replaces
-D options ****/\n")
+FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define PACKAGE_NAME
\"${TKTABLE_PKGNAME}\"\n")
+FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define PACKAGE_VERSION
\"${TKTABLE_PKGVERSION}\"\n")
+FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_COMMAND \"table\"\n")
+FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_RUNTIME \"tkTable.tcl\"\n")
+FILE(APPEND ${TKTABLE_CFG_H_FILE} "#define TBL_RUNTIME_DIR
\"${CMAKE_INSTALL_PREFIX}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}\"\n")
+
add_definitions(
- -DPACKAGE_NAME=\"${TKTABLE_PKGNAME}\"
- -DPACKAGE_VERSION=\"${TKTABLE_PKGVERSION}\"
-DSTDC_HEADERS=1
- -DTBL_COMMAND=\"table\"
- -DTBL_RUNTIME=\"tkTable.tcl\"
-
-DTBL_RUNTIME_DIR=\"${CMAKE_INSTALL_PREFIX}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}\"
)
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-12
18:34:55 UTC (rev 42156)
+++ brlcad/branches/cmake/src/other/tktable/generic/tkTable.c 2011-01-12
18:48:04 UTC (rev 42157)
@@ -22,6 +22,7 @@
* RCS: @(#) $Id: tkTable.c,v 1.34 2008/11/14 23:43:35 hobbs Exp $
*/
+#include "tktable_cfg.h"
#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
