Revision: 41021
http://brlcad.svn.sourceforge.net/brlcad/?rev=41021&view=rev
Author: starseeker
Date: 2010-10-17 04:04:05 +0000 (Sun, 17 Oct 2010)
Log Message:
-----------
Couple of minor tweaks, and now able to generate Visual Studio files. Next
step, see what fails to build.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-10-17 00:02:59 UTC (rev
41020)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-10-17 04:04:05 UTC (rev
41021)
@@ -1080,7 +1080,9 @@
# the exec target printtimestamp, which is needed by timestamp)
LIST(REMOVE_DUPLICATES CMAKE_LIBRARY_TARGET_LIST)
LIST(REMOVE_DUPLICATES CMAKE_EXEC_TARGET_LIST)
-LIST(REMOVE_DUPLICATES CMAKE_EXTERNAL_TARGET_LIST)
+IF(CMAKE_EXTERNAL_TARGET_LIST)
+ LIST(REMOVE_DUPLICATES CMAKE_EXTERNAL_TARGET_LIST)
+ENDIF(CMAKE_EXTERNAL_TARGET_LIST)
FOREACH(libtarget ${CMAKE_LIBRARY_TARGET_LIST})
get_target_property(target_location ${libtarget} LOCATION)
if(target_location)
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-17 00:02:59 UTC
(rev 41020)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-10-17 04:04:05 UTC
(rev 41021)
@@ -222,20 +222,35 @@
#THIRD_PARTY_AUTORECONF_EXTERNAL_PROJECT(TKHTML tkhtml src/other/tkhtml ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
IF(BRLCAD_BUILD_LOCAL_TKHTML)
- ADD_SUBDIRECTORY(tkhtml)
- ADD_DEPENDENCIES(Tkhtml tk tcl)
+ ADD_SUBDIRECTORY(tkhtml)
+ IF(BRLCAD_BUILD_LOCAL_TCL)
+ ADD_DEPENDENCIES(tkhtml tcl)
+ ENDIF(BRLCAD_BUILD_LOCAL_TCL)
+ IF(BRLCAD_BUILD_LOCAL_TK)
+ ADD_DEPENDENCIES(tkhtml tk)
+ ENDIF(BRLCAD_BUILD_LOCAL_TK)
ENDIF(BRLCAD_BUILD_LOCAL_TKHTML)
#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TKPNG tkpng src/other/tkpng ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
IF(BRLCAD_BUILD_LOCAL_TKPNG)
ADD_SUBDIRECTORY(tkpng)
- ADD_DEPENDENCIES(tkpng tk tcl)
+ IF(BRLCAD_BUILD_LOCAL_TCL)
+ ADD_DEPENDENCIES(tkpng tcl)
+ ENDIF(BRLCAD_BUILD_LOCAL_TCL)
+ IF(BRLCAD_BUILD_LOCAL_TK)
+ ADD_DEPENDENCIES(tkpng tk)
+ ENDIF(BRLCAD_BUILD_LOCAL_TK)
ENDIF(BRLCAD_BUILD_LOCAL_TKPNG)
#THIRD_PARTY_AUTOCONF_EXTERNAL_PROJECT(TKTABLE tktable src/other/tktable ""
"--with-tcl=${TCL_CONF_PREFIX};--with-tk=${TK_CONF_PREFIX}")
IF(BRLCAD_BUILD_LOCAL_TKTABLE)
ADD_SUBDIRECTORY(tktable)
- ADD_DEPENDENCIES(Tktable tk tcl)
+ IF(BRLCAD_BUILD_LOCAL_TCL)
+ ADD_DEPENDENCIES(Tktable tcl)
+ ENDIF(BRLCAD_BUILD_LOCAL_TCL)
+ IF(BRLCAD_BUILD_LOCAL_TK)
+ ADD_DEPENDENCIES(Tktable tk)
+ ENDIF(BRLCAD_BUILD_LOCAL_TK)
ENDIF(BRLCAD_BUILD_LOCAL_TKTABLE)
# OpenNURBS Library
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
