Revision: 40559
http://brlcad.svn.sourceforge.net/brlcad/?rev=40559&view=rev
Author: starseeker
Date: 2010-09-14 00:29:38 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Minor tweaks, update todo file.
Modified Paths:
--------------
brlcad/branches/cmake/TODO.cmake
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/TODO.cmake
===================================================================
--- brlcad/branches/cmake/TODO.cmake 2010-09-14 00:21:18 UTC (rev 40558)
+++ brlcad/branches/cmake/TODO.cmake 2010-09-14 00:29:38 UTC (rev 40559)
@@ -9,12 +9,6 @@
3. Our tcl autopath function for adding paths to the package search list
needs fixing - CMake breaks
assumptions it was using.
-4. Scrub the third party logic and clean up/simplify - try to get away from
using BRLCAD_ variables
- when they aren't needed.
-
-5. Break logic out of the toplevel into src and src/other dirs - among other
things, we want to
- be able to cd in to src and type make to avoid the doc subdirectory.
-
6. Review the dist logic in the toplevel Makefile.am. Gonna have to study up
on CPack and CTest -
figure out the process for checking permissions, install results, etc.
in order to provide
the same robustness for CMake generated tarballs that we have for
autotools.
@@ -25,3 +19,14 @@
9. Multiplatform testing. Specifically, find a Windows box and
conditionalize everything which
doesn't work out-of-box (lex/yacc and sh based logic are obvious, other
probables)
+
+
+Done (to first order, all this needs testing)
+
+4. Scrub the third party logic and clean up/simplify - try to get away from
using BRLCAD_ variables
+ when they aren't needed.
+
+5. Break logic out of the toplevel into src and src/other dirs - among other
things, we want to
+ be able to cd in to src and type make to avoid the doc subdirectory.
+
+
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-14 00:21:18 UTC
(rev 40558)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-14 00:29:38 UTC
(rev 40559)
@@ -70,17 +70,18 @@
SET(BRLCAD_UTAHRLE_INCLUDE_DIR "${UTAHRLE_INCLUDE_DIR}" CACHE STRING
"directory with rle.h header" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_UTAHRLE)
+
# URTToolkit
# Programs, not a library - needs libutahrle, but the "check for system
install" logic
# will be different here. Ignore for now, revisit later.
ADD_SUBDIRECTORY(URToolkit)
-# Tcl/Tk presents a number of complexities for BRL-CAD and CMake - BRL-CAD
requires
+# Tcl/Tk presents a number of complexities for BRL-CAD and CMake. BRL-CAD
requires
# far more knowledge of the details of a Tcl/Tk installation than most
programs,
-# which unfortunately means the standard FindTCL.cmake is not sufficient.
Rather than
-# use THIRD_PARTY_OPTION here, we will instead provide the option manually and
ensure
-# that BRL-CAD's own FindTCL.cmake file is loaded.
+# which unfortunately means the standard FindTCL.cmake is not sufficient. We
have our
+# own FindTCL routine which handles Tcl/Tk and its stubs, so trigger this using
+# the THIRD_PARTY_OPTION for TCL.
# Set Tcl/Tk requirements for BRL-CAD so FindTCL.cmake knows what to reject
SET(TCL_PATH_NOMATCH_PATTERNS
"/usr/brlcad;brlcad-install;${CMAKE_INSTALL_PREFIX}" CACHE STRING "Paths to
avoid when looking for tcl/tk" FORCE)
@@ -166,10 +167,8 @@
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITCL_VERSION
\"${ITCL_VERSION}\"\n")
THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(ITK itk src/other/incrTcl/itk ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
-IF(BRLCAD_BUILD_LOCAL_TK)
- ADD_DEPENDENCIES(itk itcl tcl tk)
-ENDIF(BRLCAD_BUILD_LOCAL_TK)
IF(BRLCAD_BUILD_LOCAL_ITK)
+ ADD_DEPENDENCIES(itk itcl tcl tk)
SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
ENDIF(BRLCAD_BUILD_LOCAL_ITK)
FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine ITK_VERSION \"${ITK_VERSION}\"\n")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
