Revision: 40461
http://brlcad.svn.sourceforge.net/brlcad/?rev=40461&view=rev
Author: starseeker
Date: 2010-09-04 15:39:27 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Add in libicv and libtclcad. libtclcad is a problem child, or if it isn't
incrTcl is - seems to REQUIRE private headers from Tcl/Tk, which is likely to
complicate using the results of FindTCL
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/libicv/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-04 14:45:25 UTC (rev
40460)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-04 15:39:27 UTC (rev
40461)
@@ -457,6 +457,11 @@
CHECK_LIBRARY_EXISTS(l yyless "" HAVE_SOLARISLEXERLIB)
CHECK_LIBRARY_EXISTS(stdc++ main "" HAVE_STDCCXX)
+
+
+# Not sure if this is correct or not!
+BRLCAD_INCLUDE_FILE(stddef.h STDC_HEADERS)
+
# Some of these include should probably be handled by the Find*
# routines - currently this isn't quite a 1/1 match to the list
# in configure.ac and will probably change more - will also need to
@@ -913,6 +918,7 @@
)
SET(BRLCAD_BUILD_LOCAL_IWIDGETS OFF)
ENDIF(NOT IWIDGETS_FOUND OR BRLCAD_BUILD_LOCAL_IWIDGETS)
+FILE(APPEND ${CONFIG_H_FILE} "#define IWIDGETS_VERSION \"4.0.1\"\n")
IF(NOT TKHTML_FOUND OR BRLCAD_BUILD_LOCAL_TKHTML)
IF(NOT BRLCAD_SYSTEM_LIBS_ONLY)
@@ -1095,6 +1101,9 @@
#ADD_SUBDIRECTORY(src/librtserver)
ADD_SUBDIRECTORY(src/libdm)
ADD_SUBDIRECTORY(src/libfft)
+ADD_SUBDIRECTORY(src/libicv)
+ADD_SUBDIRECTORY(src/libmultispectral)
+ADD_SUBDIRECTORY(src/libtclcad)
# Now that everything is configured, print a summary of the build settings.
This is a bit complicated, but
# the basic idea is to print labels, "smart" spacers around those labels to
line everything up, and the
Modified: brlcad/branches/cmake/src/libicv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libicv/CMakeLists.txt 2010-09-04 14:45:25 UTC
(rev 40460)
+++ brlcad/branches/cmake/src/libicv/CMakeLists.txt 2010-09-04 15:39:27 UTC
(rev 40461)
@@ -3,9 +3,9 @@
)
include_directories(
- ../../include
- ../other
- ../other/tcl/generic
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${TCL_INCLUDE_PATH}
)
add_definitions(
Added: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
(rev 0)
+++ brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-04 15:39:27 UTC
(rev 40461)
@@ -0,0 +1,42 @@
+IF(WIN32 AND BRLCAD-ENABLE_OPENGL)
+ SET(TCLCAD_DEFINES "${TCLCAD_DEFINES} -DDM_WGL -DIF_WGL")
+ENDIF(WIN32 AND BRLCAD-ENABLE_OPENGL)
+
+IF(BRLCAD-ENABLE_X11)
+ SET(TCLCAD_DEFINES "${TCLCAD_DEFINES} -DDM_X -DIF_X")
+ENDIF(BRLCAD-ENABLE_X11)
+
+IF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+ SET(TCLCAD_DEFINES "${TCLCAD_DEFINES} -DDM_OGL -DIF_OGL")
+ENDIF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
+
+IF(TK_LIBRARY)
+ SET(TCLCAD_DEFINES "${TCLCAD_DEFINES} -DDM_TK -DIF_TK")
+ENDIF(TK_LIBRARY)
+
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ ${BRLCAD_PNG_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
+ #TODO - this is needed because tclInt.h isn't being found
+ #by system itclInt.h - located in a deeper subdirectory
+ #not returned by FindTCL. Either need to ferrit out the
+ #private directories if on system, or determine why the
+ #itcl headers are asking for something they shouldn't be
+ ${BRLCAD_SOURCE_DIR}/src/other/tcl/generic
+ #Same deal for tclUnixPort.h
+ ${BRLCAD_SOURCE_DIR}/src/other/tcl/unix
+)
+
+add_definitions(
+ -DHAVE_CONFIG_H
+ -DBRLCADBUILD=1
+ ${TCLCAD_DEFINES}
+)
+
+add_library(tclcad tclcad.c tclcadAutoPath.c tkImgFmtPIX.c ged_obj.c)
+target_link_libraries(tclcad dm ged ${X11_LIBRARIES} ${X11_Xi_LIB})
+INSTALL(TARGETS tclcad LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
Property changes on: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
