Revision: 45960
http://brlcad.svn.sourceforge.net/brlcad/?rev=45960&view=rev
Author: starseeker
Date: 2011-08-13 02:31:10 +0000 (Sat, 13 Aug 2011)
Log Message:
-----------
Tweaks to get Tcl/Tk package testing going again.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake 2011-08-13 02:09:10 UTC
(rev 45959)
+++ brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake 2011-08-13 02:31:10 UTC
(rev 45960)
@@ -47,7 +47,7 @@
# Stash the previous results (if any) so we don't repeatedly
call out the tests - only report
# if something actually changes in subsequent runs.
SET(${PKGNAME_UPPER}_FOUND_STATUS ${${PKGNAME_UPPER}_FOUND})
- IF(NOT ${wishcmd})
+ IF(${wishcmd} STREQUAL "")
SET(${PKGNAME_UPPER}_FOUND "${PKGNAME_UPPER}-NOTFOUND"
CACHE STRING "${PKGNAME_UPPER}_FOUND" FORCE)
IF(NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} STREQUAL
"System" AND NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} STREQUAL "Auto (S)")
# Can't test and we're not forced to system by
either local settings or the toplevel - turn it on
@@ -57,7 +57,7 @@
MESSAGE(WARNING "No tclsh/wish command
available for testing, but system version of ${packagename} is requested -
assuming availability of package.")
ENDIF("${${PKGNAME_UPPER}_FOUND_STATUS}"
MATCHES "${PKGNAME_UPPER}-NOTFOUND" AND NOT ${PKGNAME_UPPER}_FOUND)
ENDIF(NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}
STREQUAL "System" AND NOT ${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} STREQUAL "Auto
(S)")
- ELSE(NOT ${wishcmd})
+ ELSE(${wishcmd} STREQUAL "")
SET(packagefind_script "
catch {package require ${packagename}}
set packageversion NOTFOUND
@@ -87,9 +87,10 @@
SET(${PKGNAME_UPPER}_FIND_QUIETLY TRUE)
ENDIF("${${PKGNAME_UPPER}_FOUND_STATUS}" MATCHES
"${PKGNAME_UPPER}-NOTFOUND" AND NOT ${PKGNAME_UPPER}_FOUND)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(${PKGNAME_UPPER}
DEFAULT_MSG ${PKGNAME_UPPER}_PACKAGE_VERSION)
- ENDIF(NOT ${wishcmd})
+ ENDIF(${wishcmd} STREQUAL "")
ENDIF(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} STREQUAL "Bundled" OR
${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER} STREQUAL "Auto (B)")
IF(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
+ STRING(TOLOWER ${packagename} PKGNAME_LOWER)
add_subdirectory(${dir})
FOREACH(dep ${depends})
string(TOUPPER ${dep} DEP_UPPER)
@@ -97,7 +98,7 @@
add_dependencies(${packagename} ${dep})
endif(BRLCAD_BUILD_${DEP_UPPER})
ENDFOREACH(dep ${depends})
- file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/${packagename}.dist
${packagename}_ignore_files)
+ file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME_LOWER}.dist
${packagename}_ignore_files)
DISTCHECK_IGNORE(${dir} ${packagename}_ignore_files)
ELSE(${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}_BUILD)
DISTCHECK_IGNORE_ITEM(${dir})
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-13 02:09:10 UTC (rev
45959)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-13 02:31:10 UTC (rev
45960)
@@ -311,7 +311,7 @@
# build, only compile extensions that don't use Tk.
INCLUDE(${BRLCAD_CMAKE_DIR}/ThirdParty_TCL.cmake)
-THIRD_PARTY_TCL_PACKAGE(itcl incrTcl/itcl "${TCL_TCLSH_EXECUTABLE}" "tcl")
+THIRD_PARTY_TCL_PACKAGE(Itcl incrTcl/itcl "${TCL_TCLSH_EXECUTABLE}" "tcl")
IF(BRLCAD_ITCL_BUILD)
SET(ITCL_LIBRARY itcl CACHE STRING "ITCL_LIBRARY" FORCE)
MARK_AS_ADVANCED(ITCL_LIBRARY)
@@ -331,7 +331,7 @@
MARK_AS_ADVANCED(ITCL_VERSION)
IF(BRLCAD-ENABLE_TK)
- THIRD_PARTY_TCL_PACKAGE(itk incrTcl/itk "${TCL_WISH_EXECUTABLE}"
"tcl;itcl;tk")
+ THIRD_PARTY_TCL_PACKAGE(Itk incrTcl/itk "${TCL_WISH_EXECUTABLE}"
"tcl;itcl;tk")
IF(BRLCAD_ITK_BUILD)
SET(ITK_LIBRARY itk CACHE STRING "ITK_LIBRARY" FORCE)
MARK_AS_ADVANCED(ITK_LIBRARY)
@@ -341,7 +341,7 @@
ENDIF(BRLCAD_ITK_BUILD)
MARK_AS_ADVANCED(ITK_VERSION)
- THIRD_PARTY_TCL_PACKAGE(iwidgets iwidgets "${TCL_WISH_EXECUTABLE}"
"tcl;tk;itcl;itk")
+ THIRD_PARTY_TCL_PACKAGE(Iwidgets iwidgets "${TCL_WISH_EXECUTABLE}"
"tcl;tk;itcl;itk")
IF(BRLCAD_IWIDGETS_BUILD)
SET(IWIDGETS_VERSION "4.0.1" CACHE STRING "IWIDGETS_VERSION"
FORCE)
ELSE(BRLCAD_IWIDGETS_BUILD)
@@ -350,11 +350,11 @@
FILE(APPEND ${CONFIG_H_FILE} "#define IWIDGETS_VERSION
\"${IWIDGETS_VERSION}\"\n")
MARK_AS_ADVANCED(IWIDGETS_VERSION)
- THIRD_PARTY_TCL_PACKAGE(tkhtml tkhtml "${TCL_WISH_EXECUTABLE}" "tcl;tk")
+ THIRD_PARTY_TCL_PACKAGE(Tkhtml tkhtml "${TCL_WISH_EXECUTABLE}" "tcl;tk")
THIRD_PARTY_TCL_PACKAGE(tkpng tkpng "${TCL_WISH_EXECUTABLE}" "tcl;tk")
- THIRD_PARTY_TCL_PACKAGE(tktable tktable "${TCL_WISH_EXECUTABLE}"
"tcl;tk")
+ THIRD_PARTY_TCL_PACKAGE(Tktable tktable "${TCL_WISH_EXECUTABLE}"
"tcl;tk")
ELSE(BRLCAD-ENABLE_TK)
DISTCHECK_IGNORE_ITEM(incrTcl/itk)
DISTCHECK_IGNORE_ITEM(iwidgets)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
