Revision: 40459
http://brlcad.svn.sourceforge.net/brlcad/?rev=40459&view=rev
Author: starseeker
Date: 2010-09-03 21:35:53 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Turning off OpenGL for now - need to think about locating it on OSX. Define
HAVE_TK and provide the Xi library, and we can build libdm for X11 and Tk.
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/libdm/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-03 21:06:40 UTC (rev
40458)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-03 21:35:53 UTC (rev
40459)
@@ -403,7 +403,7 @@
find_package(X11)
endif (BRLCAD-ENABLE_X11)
-OPTION(BRLCAD-ENABLE_OPENGL "Use OpenGL." ON)
+OPTION(BRLCAD-ENABLE_OPENGL "Use OpenGL." OFF)
if (BRLCAD-ENABLE_OPENGL)
INCLUDE(${BRLCAD_CMAKE_DIR}/FindGL.cmake)
endif (BRLCAD-ENABLE_OPENGL)
@@ -761,6 +761,7 @@
ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_SYSTEM_LIBS_ONLY)
IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_BUILD_LOCAL_LIBS)
SET(BRLCAD_BUILD_LOCAL_TK ON)
+
ExternalProject_Add(
tcl
DOWNLOAD_COMMAND ""
@@ -803,6 +804,10 @@
SET(TCL_DEP "tcl")
SET(TK_DEP "tk")
ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD_BUILD_LOCAL_LIBS)
+IF(TK_LIBRARY)
+ SET(HAVE_TK 1)
+ FILE(APPEND ${CONFIG_H_FILE} "#cmakedefine HAVE_TK 1\n")
+ENDIF(TK_LIBRARY)
# Depending on the Tcl/Tk results, look for packages required by BRL-CAD. If
# building local Tcl/Tk, go ahead and enable all the packages as well -
otherwise,
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-03 21:06:40 UTC
(rev 40458)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-03 21:35:53 UTC
(rev 40459)
@@ -50,16 +50,20 @@
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${BRLCAD_TERMLIB_INCLUDE_DIR}
- ${X11_X11_INCLUDE_DIR}
+ ${BRLCAD_PNG_INCLUDE_DIR}
+ ${X11_INCLUDE_DIR}
+ ${TCL_INCLUDE_PATH}
+ ${TK_INCLUDE_PATH}
)
add_definitions(
-DHAVE_CONFIG_H
- -DBRLCADBUILD
+ -DBRLCADBUILD=1
${DM_DEFINES}
)
add_library(dm ${LIBDM_SRCS})
-target_link_libraries(dm librt fb ged ${X11_LIBRARIES} ${OPENGL_LIBRARIES})
+MESSAGE("X11_LIBRARIES: ${X11_LIBRARIES} ${X11_Xi_LIB}")
+target_link_libraries(dm librt fb ged ${X11_LIBRARIES} ${X11_Xi_LIB})
INSTALL(TARGETS dm LIBRARY DESTINATION ${BRLCAD_INSTALL_LIB_DIR})
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
