Revision: 40588
http://brlcad.svn.sourceforge.net/brlcad/?rev=40588&view=rev
Author: starseeker
Date: 2010-09-16 16:16:40 +0000 (Thu, 16 Sep 2010)
Log Message:
-----------
Make an explicit ENABLE_TK option and use that instead of TK_LIBRARY
Modified Paths:
--------------
brlcad/branches/cmake/CMakeLists.txt
brlcad/branches/cmake/src/bwish/CMakeLists.txt
brlcad/branches/cmake/src/fb/CMakeLists.txt
brlcad/branches/cmake/src/libbu/CMakeLists.txt
brlcad/branches/cmake/src/libdm/CMakeLists.txt
brlcad/branches/cmake/src/libfb/CMakeLists.txt
brlcad/branches/cmake/src/libsysv/CMakeLists.txt
brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
brlcad/branches/cmake/src/mged/CMakeLists.txt
brlcad/branches/cmake/src/other/CMakeLists.txt
brlcad/branches/cmake/src/rttherm/CMakeLists.txt
brlcad/branches/cmake/src/util/CMakeLists.txt
Modified: brlcad/branches/cmake/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/CMakeLists.txt 2010-09-16 15:40:22 UTC (rev
40587)
+++ brlcad/branches/cmake/CMakeLists.txt 2010-09-16 16:16:40 UTC (rev
40588)
@@ -414,6 +414,11 @@
SET(OPENGL_USE_AQUA OFF CACHE STRING "Don't use Aqua if we're doing
X11" FORCE)
endif (BRLCAD-ENABLE_X11)
+# Enable/disable features requiring the Tk toolkit - usually this should
+# be on, as a lot of functionality in BRL-CAD depends on Tk
+OPTION(BRLCAD-ENABLE_TK "Enable features requiring the Tk toolkit" ON)
+MARK_AS_ADVANCED(BRLCAD-ENABLE_TK)
+
# Enable features requring OPENGL
OPTION(BRLCAD-ENABLE_OPENGL "Use OpenGL." ON)
if (BRLCAD-ENABLE_OPENGL)
Modified: brlcad/branches/cmake/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/bwish/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/bwish/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -5,9 +5,9 @@
${TK_INCLUDE_PATH}
)
-IF(TK_LIBRARY)
+IF(BRLCAD-ENABLE_TK)
BRLCAD_ADDEXEC(bwish "cmd.c input.c main.c tcl.c" "libtclcad libdm
libtermio")
SET_TARGET_PROPERTIES(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
-ENDIF(TK_LIBRARY)
+ENDIF(BRLCAD-ENABLE_TK)
BRLCAD_ADDEXEC(btclsh "cmd.c input.c main.c tcl.c" "libbu libtclcad libtermio
${X11_LIBRARIES} ${X11_Xi_LIB} libdm")
Modified: brlcad/branches/cmake/src/fb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/fb/CMakeLists.txt 2010-09-16 15:40:22 UTC (rev
40587)
+++ brlcad/branches/cmake/src/fb/CMakeLists.txt 2010-09-16 16:16:40 UTC (rev
40588)
@@ -35,8 +35,10 @@
BRLCAD_ADDEXEC(fbpoint fbpoint.c "libbu libfb libtermio libpkg")
BRLCAD_ADDEXEC(fbscanplot fbscanplot.c libfb)
BRLCAD_ADDEXEC(fbstretch "fbstretch.c ioutil.c" libfb)
-BRLCAD_ADDEXEC(fbthreadtest fbthreadtest "libfb ${TK_LIBRARY}")
-SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS "IF_TK")
+IF(BRLCAD-ENABLE_TK)
+ BRLCAD_ADDEXEC(fbthreadtest fbthreadtest "libfb ${TK_LIBRARY}")
+ SET_TARGET_PROPERTIES(fbthreadtest PROPERTIES COMPILE_DEFINITIONS
"IF_TK")
+ENDIF(BRLCAD-ENABLE_TK)
BRLCAD_ADDEXEC(fbzoom fbzoom.c "libfb libtermio")
BRLCAD_ADDEXEC(gif-fb "gif-fb.c ioutil.c" libfb)
BRLCAD_ADDEXEC(gif2fb gif2fb.c libfb)
Modified: brlcad/branches/cmake/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/libbu/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -81,6 +81,9 @@
BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}" "${CMAKE_THREAD_LIBS_INIT}
${PNG_LIBRARY} ${TCL_LIBRARY}" STRICT)
SET_TARGET_PROPERTIES(libbu PROPERTIES VERSION 19.0.1 SOVERSION 19)
+IF(BRLCAD_BUILD_LOCAL_TCL)
+ ADD_DEPENDENCIES(libbu tcl)
+ENDIF(BRLCAD_BUILD_LOCAL_TCL)
add_executable(htester htester.c)
target_link_libraries(htester ${CMAKE_THREAD_LIBS_INIT} ${PNG_LIBRARY} libbu)
Modified: brlcad/branches/cmake/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/libdm/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -14,10 +14,10 @@
SET(DM_DEFINES "${DM_DEFINES} -DDM_RTGL -DIF_RTGL")
ENDIF(BRLCAD-ENABLE_RTGL)
-IF(TK_LIBRARY)
+IF(BRLCAD-ENABLE_TK)
SET(DM_DEFINES "${DM_DEFINES} -DDM_TK -DIF_TK")
SET(DM_TKLIB ${TK_LIBRARY})
-ENDIF(TK_LIBRARY)
+ENDIF(BRLCAD-ENABLE_TK)
SET(LIBDM_SRCS
@@ -67,3 +67,6 @@
BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}" "librt libfb libged ${DM_XLIBS}
${X11_Xi_LIB} ${DM_TKLIB}")
SET_TARGET_PROPERTIES(libdm PROPERTIES VERSION 19.0.1 SOVERSION 19)
+IF(BRLCAD_BUILD_LOCAL_TK AND BRLCAD-ENABLE_TK)
+ ADD_DEPENDENCIES(libdm tk)
+ENDIF(BRLCAD_BUILD_LOCAL_TK AND BRLCAD-ENABLE_TK)
Modified: brlcad/branches/cmake/src/libfb/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/libfb/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -54,5 +54,8 @@
BRLCAD_ADDLIB(libfb "${LIBFB_SOURCES}" "libbu libpkg ${LINKLIBS}")
SET_TARGET_PROPERTIES(libfb PROPERTIES VERSION 19.0.1 SOVERSION 19)
+IF(BRLCAD_BUILD_LOCAL_TK AND BRLCAD-ENABLE_TK)
+ ADD_DEPENDENCIES(libfb tk)
+ENDIF(BRLCAD_BUILD_LOCAL_TK AND BRLCAD-ENABLE_TK)
install(FILES libfb.3 DESTINATION ${MAN_DIR}/man3)
Modified: brlcad/branches/cmake/src/libsysv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libsysv/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/libsysv/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -20,3 +20,7 @@
BRLCAD_ADDLIB(libsysv "${LIBSYSV_SOURCES}" "${TCL_LIBRARY}")
SET_TARGET_PROPERTIES(libsysv PROPERTIES VERSION 19.0.1 SOVERSION 19)
+
+IF(BRLCAD_BUILD_LOCAL_TCL)
+ ADD_DEPENDENCIES(libsysv tcl)
+ENDIF(BRLCAD_BUILD_LOCAL_TCL)
Modified: brlcad/branches/cmake/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/libtclcad/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -10,9 +10,9 @@
SET(TCLCAD_DEFINES "${TCLCAD_DEFINES} -DDM_OGL -DIF_OGL")
ENDIF(BRLCAD-ENABLE_X11 AND BRLCAD-ENABLE_OPENGL)
-IF(TK_LIBRARY)
+IF(BRLCAD-ENABLE_TK)
SET(TCLCAD_DEFINES "${TCLCAD_DEFINES} -DDM_TK -DIF_TK")
-ENDIF(TK_LIBRARY)
+ENDIF(BRLCAD-ENABLE_TK)
include_directories(
${PNG_INCLUDE_DIR}
Modified: brlcad/branches/cmake/src/mged/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/mged/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -27,15 +27,15 @@
SET(MGED_DEFINES "${MGED_DEFINES} -DDM_X -DIF_X")
ENDIF(BRLCAD-ENABLE_X11)
-#IF(TK_LIBRARY)
+#IF(BRLCAD-ENABLE_TK)
# SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-tk.c")
# SET(MGED_DEFINES "${MGED_DEFINES} -DDM_TK -DIF_TK")
-#ENDIF(TK_LIBRARY)
+#ENDIF(BRLCAD-ENABLE_TK)
#IF(BRLCAD-ENABLE_RTGL)
# SET(MGED_DM_SOURCES "${MGED_DM_SOURCES};dm-rtgl.c")
# SET(MGED_DEFINES "${MGED_DEFINES} -DDM_RTGL -DIF_RTGL")
-#ENDIF(TK_LIBRARY)
+#ENDIF(BRLCAD-ENABLE_RTGL)
add_definitions(
${MGED_DEFINES}
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -78,6 +78,12 @@
SET(TCL_PATH_NOMATCH_PATTERNS
"/usr/brlcad;brlcad-install;${CMAKE_INSTALL_PREFIX}" CACHE STRING "Paths to
avoid when looking for tcl/tk" FORCE)
SET(TCL_MIN_VERSION "8.5" CACHE STRING "Minimum acceptable Tcl/Tk version"
FORCE)
+IF(BRLCAD-ENABLE_TK)
+ SET(TCL_REQUIRE_TK 1)
+ELSE(BRLCAD-ENABLE_TK)
+ SET(TCL_REQUIRE_TK 0)
+ENDIF(BRLCAD-ENABLE_TK)
+
THIRD_PARTY_OPTION(TCL tcl)
IF(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK)
OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" ON)
Modified: brlcad/branches/cmake/src/rttherm/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/rttherm/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/rttherm/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -4,12 +4,12 @@
${TK_INCLUDE_PATH}
)
-IF(BRLCAD-ENABLE_X11)
+IF(BRLCAD-ENABLE_X11 and BRLCAD-ENABLE_TK)
FOREACH(xlib ${X11_LIBRARIES})
SET(RTTHERM_XLIBS "${RTTHERM_XLIBS} ${xlib}")
ENDFOREACH(xlib ${X11_LIBRARIES})
BRLCAD_ADDEXEC(ssampview "spectrum.c ssampview.c" "liboptical libfb
${TK_LIBRARY} ${RTTHERM_XLIBS}")
-ENDIF(BRLCAD-ENABLE_X11)
+ENDIF(BRLCAD-ENABLE_X11 BRLCAD-ENABLE_TK)
BRLCAD_ADDEXEC(rttherm "spectrum.c viewtherm.c" "librttherm liboptical libfb
libmultispectral libged")
SET_TARGET_PROPERTIES(rttherm PROPERTIES COMPILE_DEFINITIONS
"RT_MULTISPECTRAL")
Modified: brlcad/branches/cmake/src/util/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/util/CMakeLists.txt 2010-09-16 15:40:22 UTC
(rev 40587)
+++ brlcad/branches/cmake/src/util/CMakeLists.txt 2010-09-16 16:16:40 UTC
(rev 40588)
@@ -8,11 +8,11 @@
)
IF(BRLCAD-ENABLE_X11)
- BRLCAD_ADDEXEC(pl-X pl-X.c "libbu libdm")
- IF(TK_LIBRARY)
- BRLCAD_ADDEXEC(pl-dm pl-dm.c "libbu libdm")
- BRLCAD_ADDEXEC(bombardier bombardier.c "libbu libtclcad")
- ENDIF(TK_LIBRARY)
+ BRLCAD_ADDEXEC(pl-X pl-X.c "libbu libdm")
+ IF(BRLCAD-ENABLE_TK)
+ BRLCAD_ADDEXEC(pl-dm pl-dm.c "libbu libdm")
+ BRLCAD_ADDEXEC(bombardier bombardier.c "libbu libtclcad")
+ ENDIF(BRLCAD-ENABLE_TK)
ENDIF(BRLCAD-ENABLE_X11)
INSTALL(FILES pl-dm.c DESTINATION
${BRLCAD_INSTALL_DATA_DIR}/sample_applications)
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
