Revision: 45982
http://brlcad.svn.sourceforge.net/brlcad/?rev=45982&view=rev
Author: starseeker
Date: 2011-08-15 02:34:04 +0000 (Mon, 15 Aug 2011)
Log Message:
-----------
Ah, right. Original CMake logic written assuming package require based
Itcl/Itk usage - when C libs were again necessary, just hacked in quickly.
Can't get away with that anymore, so use variables where appropriate and look
for itk C library
Modified Paths:
--------------
brlcad/trunk/src/bwish/CMakeLists.txt
brlcad/trunk/src/mged/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/src/bwish/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/bwish/CMakeLists.txt 2011-08-15 02:09:27 UTC (rev
45981)
+++ brlcad/trunk/src/bwish/CMakeLists.txt 2011-08-15 02:34:04 UTC (rev
45982)
@@ -10,20 +10,20 @@
)
IF(WIN32)
- BRLCAD_ADDEXEC(btclsh "cadAppInit.c consoleMain.c" "libtclcad libged
itcl")
+ BRLCAD_ADDEXEC(btclsh "cadAppInit.c consoleMain.c" "libtclcad libged
${ITCL_LIBRARY}")
CMAKEFILES(cmd.c input.c main.c tcl.c)
ELSE(WIN32)
- BRLCAD_ADDEXEC(btclsh "cmd.c input.c main.c tcl.c" "libbu libtclcad
libtermio itcl")
+ BRLCAD_ADDEXEC(btclsh "cmd.c input.c main.c tcl.c" "libbu libtclcad
libtermio ${ITCL_LIBRARY}")
CMAKEFILES(cadAppInit.c consoleMain.c)
ENDIF(WIN32)
IF(BRLCAD-ENABLE_TK)
IF(WIN32)
add_executable(bwish WIN32 cadAppInit.c winMain.c)
- target_link_libraries(bwish libtclcad libdm imm32.lib
comctl32.lib itcl itk)
+ target_link_libraries(bwish libtclcad libdm imm32.lib
comctl32.lib ${ITCL_LIBRARY} ${ITK_LIBRARY})
CMAKEFILES(cmd.c input.c main.c tcl.c)
ELSE(WIN32)
- BRLCAD_ADDEXEC(bwish "cmd.c input.c main.c tcl.c" "libtclcad
libdm libtermio ${X11_LIBRARIES} ${X11_Xi_LIB} libdm itcl itk")
+ BRLCAD_ADDEXEC(bwish "cmd.c input.c main.c tcl.c" "libtclcad
libdm libtermio ${X11_LIBRARIES} ${X11_Xi_LIB} libdm ${ITCL_LIBRARY}
${ITK_LIBRARY}")
CMAKEFILES(winMain.c)
ENDIF(WIN32)
SET_TARGET_PROPERTIES(bwish PROPERTIES COMPILE_DEFINITIONS "BWISH=1")
Modified: brlcad/trunk/src/mged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/mged/CMakeLists.txt 2011-08-15 02:09:27 UTC (rev
45981)
+++ brlcad/trunk/src/mged/CMakeLists.txt 2011-08-15 02:34:04 UTC (rev
45982)
@@ -117,9 +117,9 @@
ENDIF(NOT WIN32)
IF(NOT WIN32)
- BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
libtermio ${pointstarget} itcl itk")
+ BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
libtermio ${pointstarget} ${ITCL_LIBRARY} ${ITK_LIBRARY}")
ELSE(NOT WIN32)
- BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
itcl itk ws2_32.lib opengl32.lib")
+ BRLCAD_ADDEXEC(mged "${MGED_SOURCES}" "libtclcad libged libwdb libdm
${ITCL_LIBRARY} ${ITK_LIBRARY} ws2_32.lib opengl32.lib")
ENDIF(NOT WIN32)
IF(${ITCL_LIBRARY} MATCHES "itcl")
ADD_DEPENDENCIES(mged itcl)
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 02:09:27 UTC (rev
45981)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-08-15 02:34:04 UTC (rev
45982)
@@ -339,6 +339,11 @@
SET(ITK_VERSION "3.3" CACHE STRING "ITK_VERSION" FORCE)
ELSE(BRLCAD_ITK_BUILD)
SET(ITK_VERSION "${ITCL_VERSION}" CACHE STRING "ITK_VERSION"
FORCE)
+ find_library(ITK_LIBRARY NAMES itk itk${ITCL_PACKAGE_VERSION}
PATH_SUFFIXES itk${ITCL_PACKAGE_VERSION})
+ SET(ITK_LIBRARY ${ITK_LIBRARY} CACHE STRING "ITK_LIBRARY" FORCE)
+ get_filename_component(ITK_BIN_PREFIX ${ITK_LIBRARY} PATH)
+ MARK_AS_ADVANCED(ITCL_LIBRARY)
+
ENDIF(BRLCAD_ITK_BUILD)
MARK_AS_ADVANCED(ITK_VERSION)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
