Revision: 41228
http://brlcad.svn.sourceforge.net/brlcad/?rev=41228&view=rev
Author: starseeker
Date: 2010-11-02 14:54:50 +0000 (Tue, 02 Nov 2010)
Log Message:
-----------
Hmm... if I'm not mistaken, the awk logic isn't needed if we pass in the right
pre-defined variables. Grep logic is a tad less clear but it seems to be
checking for -prebind in LDFLAGS and passing that into the link flags if needed
- can handle that elsewhere more cleanly I think.
Modified Paths:
--------------
brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-11-02 14:33:34 UTC
(rev 41227)
+++ brlcad/branches/cmake/src/other/tcl/CMakeLists.txt 2010-11-02 14:54:50 UTC
(rev 41228)
@@ -683,7 +683,7 @@
GET_TARGET_PROPERTY(TCL_INSTALL_LIBNAME tcl LOCATION)
SET_TARGET_PROPERTIES(tcl PROPERTIES VERSION ${TCL_VERSION} SOVERSION
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION})
IF(${CMAKE_SYSTEM_NAME} MATCHES "^Darwin$")
- SET_TARGET_PROPERTIES(tcl PROPERTIES LINK_FLAGS "-compatibility_version
${TCL_VERSION} -current_version ${TCL_VERSION}`echo ${TCL_PATCH_LEVEL} | awk
['{match($0, \"\\\\\\.[0-9]+\"); print substr($0,RSTART,RLENGTH)}']`
-install_name ${TCL_INSTALL_LIBNAME} ' -seg1addr 0xa000000' -sectcreate __TEXT
__info_plist Tcl-Info.plist")
+ SET_TARGET_PROPERTIES(tcl PROPERTIES LINK_FLAGS "-compatibility_version
${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION} -current_version ${TCL_VERSION}
-install_name ${TCL_INSTALL_LIBNAME} -seg1addr 0xa000000 -sectcreate __TEXT
__info_plist Tcl-Info.plist")
SET(EXTRA_TCLSH_LIBS "-sectcreate __TEXT __info_plist Tclsh-Info.plist")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macosx/Tcl-Info.plist.in
${TCL_BINARY_DIR}/Tcl-Info.plist)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/macosx/Tclsh-Info.plist.in
${TCL_BINARY_DIR}/Tclsh-Info.plist)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Nokia and AT&T present the 2010 Calling All Innovators-North America contest
Create new apps & games for the Nokia N8 for consumers in U.S. and Canada
$10 million total in prizes - $4M cash, 500 devices, nearly $6M in marketing
Develop with Nokia Qt SDK, Web Runtime, or Java and Publish to Ovi Store
http://p.sf.net/sfu/nokia-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
