[brlcad-commits] SF.net SVN: brlcad:[42868] brlcad/branches/cmake/src
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <sta...@us...> - 2011-02-01 23:45:04
|
Revision: 42868 http://brlcad.svn.sourceforge.net/brlcad/?rev=42868&view=rev Author: starseeker Date: 2011-02-01 23:44:58 +0000 (Tue, 01 Feb 2011) Log Message: ----------- Don't enable Tk even with ENABLE_ALL if we aren't supposed to build it Modified Paths: -------------- brlcad/branches/cmake/src/bwish/CMakeLists.txt brlcad/branches/cmake/src/other/CMakeLists.txt Modified: brlcad/branches/cmake/src/bwish/CMakeLists.txt =================================================================== --- brlcad/branches/cmake/src/bwish/CMakeLists.txt 2011-02-01 23:25:45 UTC (rev 42867) +++ brlcad/branches/cmake/src/bwish/CMakeLists.txt 2011-02-01 23:44:58 UTC (rev 42868) @@ -26,6 +26,6 @@ ADD_DEPENDENCIES(btclsh itcl) ENDIF(ITCL_LIBRARY MATCHES "^itcl$") -IF(ITK_LIBRARY MATCHES "^itk$") +IF(ITK_LIBRARY MATCHES "^itk$" AND BRLCAD-ENABLE_TK) ADD_DEPENDENCIES(bwish itcl itk) -ENDIF(ITK_LIBRARY MATCHES "^itk$") +ENDIF(ITK_LIBRARY MATCHES "^itk$" AND BRLCAD-ENABLE_TK) Modified: brlcad/branches/cmake/src/other/CMakeLists.txt =================================================================== --- brlcad/branches/cmake/src/other/CMakeLists.txt 2011-02-01 23:25:45 UTC (rev 42867) +++ brlcad/branches/cmake/src/other/CMakeLists.txt 2011-02-01 23:44:58 UTC (rev 42868) @@ -116,10 +116,6 @@ OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" OFF) SET(BRLCAD_BUILD_LOCAL_TK OFF CACHE BOOL "local tk build" FORCE) ENDIF(BRLCAD_BUILD_LOCAL_TCL AND TCL_REQUIRE_TK) -IF(BRLCAD-ENABLE_ALL_LOCAL_LIBS) - OPTION(BRLCAD_BUILD_LOCAL_TK "Build the local versions of Tcl/Tk" ON) - SET(BRLCAD_BUILD_LOCAL_TK ON CACHE BOOL "local tk build" FORCE) -ENDIF(BRLCAD-ENABLE_ALL_LOCAL_LIBS) MARK_AS_ADVANCED(BRLCAD_BUILD_LOCAL_TK) IF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS) ADD_SUBDIRECTORY(tcl) @@ -161,7 +157,7 @@ FILE(APPEND ${CONFIG_H_FILE} "#define TCL_SYSTEM_INITTCL_PATH \"${tcl_inittcl}\"\n") ENDIF(BRLCAD_BUILD_LOCAL_TCL OR BRLCAD-ENABLE_ALL_LOCAL_LIBS) -IF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS) +IF(BRLCAD_BUILD_LOCAL_TK) ADD_SUBDIRECTORY(tk) # Set the variables ourselves since FindTCL.cmake doesn't know about our build SET(TCL_TK_LIBRARY tk CACHE STRING "TCL_TK_LIBRARY" FORCE) @@ -191,9 +187,9 @@ ENDIF(WIN32) FILE(APPEND ${CONFIG_H_FILE} "#define HAVE_TK_H 1\n") ADD_DEPENDENCIES(tk tcl) -ELSE(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS) +ELSE(BRLCAD_BUILD_LOCAL_TK) BRLCAD_INCLUDE_FILE(tk.h HAVE_TK_H) -ENDIF(BRLCAD_BUILD_LOCAL_TK OR BRLCAD-ENABLE_ALL_LOCAL_LIBS) +ENDIF(BRLCAD_BUILD_LOCAL_TK) MARK_AS_ADVANCED(TK_INCLUDE_PATH) MARK_AS_ADVANCED(TK_LIBRARY) MARK_AS_ADVANCED(TK_STUB_LIBRARY) @@ -241,6 +237,17 @@ SET(BRLCAD_BUILD_LOCAL_TKPNG ON CACHE BOOL "Build the local TKPNG package" FORCE) OPTION(BRLCAD_BUILD_LOCAL_TKTABLE "Build the local TKTABLE package" ON) SET(BRLCAD_BUILD_LOCAL_TKTABLE ON CACHE BOOL "Build the local TKTABLE package" FORCE) + ELSE(BRLCAD_BUILD_LOCAL_TK) + OPTION(BRLCAD_BUILD_LOCAL_ITK "Build the local ITK package" OFF) + SET(BRLCAD_BUILD_LOCAL_ITK OFF CACHE BOOL "Build the local ITK package" FORCE) + OPTION(BRLCAD_BUILD_LOCAL_IWIDGETS "Build the local IWIDGETS package" OFF) + SET(BRLCAD_BUILD_LOCAL_IWIDGETS OFF CACHE BOOL "Build the local IWIDGETS package" FORCE) + OPTION(BRLCAD_BUILD_LOCAL_TKHTML "Build the local TKHTML package" OFF) + SET(BRLCAD_BUILD_LOCAL_TKHTML OFF CACHE BOOL "Build the local TKHTML package" FORCE) + OPTION(BRLCAD_BUILD_LOCAL_TKPNG "Build the local TKPNG package" OFF) + SET(BRLCAD_BUILD_LOCAL_TKPNG OFF CACHE BOOL "Build the local TKPNG package" FORCE) + OPTION(BRLCAD_BUILD_LOCAL_TKTABLE "Build the local TKTABLE package" OFF) + SET(BRLCAD_BUILD_LOCAL_TKTABLE OFF CACHE BOOL "Build the local TKTABLE package" FORCE) ENDIF(BRLCAD_BUILD_LOCAL_TK) ENDIF(NOT BRLCAD_BUILD_LOCAL_TCL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |