Revision: 55772
http://sourceforge.net/p/brlcad/code/55772
Author: starseeker
Date: 2013-06-13 22:08:06 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
remove togl include dir from isst build logic, add a custom target similar to
the one for archer that builds all isst requirements.
Modified Paths:
--------------
brlcad/trunk/src/CMakeLists.txt
brlcad/trunk/src/adrt/CMakeLists.txt
Modified: brlcad/trunk/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/CMakeLists.txt 2013-06-13 21:52:01 UTC (rev 55771)
+++ brlcad/trunk/src/CMakeLists.txt 2013-06-13 22:08:06 UTC (rev 55772)
@@ -85,7 +85,6 @@
endif(NOT WIN32)
set(level_3_dirs
- adrt
anim
brlman
burst
@@ -108,10 +107,13 @@
util
vfont
${non_win32_dirs}
- # tclscripts must come before mged and archer, so the
- # target lists are defined when the archer and mged
- # targets are defined
+ # tclscripts must come before applications like
+ # mged and archer that need the scripts in place to
+ # run. The script target lists are defined when the tclscripts
+ # directories are configured, and those lists are needed
+ # as dependencies for the targets in these directories
tclscripts
+ adrt
archer
mged
)
Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt 2013-06-13 21:52:01 UTC (rev
55771)
+++ brlcad/trunk/src/adrt/CMakeLists.txt 2013-06-13 22:08:06 UTC (rev
55772)
@@ -55,11 +55,10 @@
CMAKEFILES(${tie_HDRS})
# Tcl/Tk based ISST
-INCLUDE_DIRECTORIES(
+include_directories(
${OPENGL_INCLUDE_DIR_GL}
${OPENGL_INCLUDE_DIR_GLX}
${X11_INCLUDE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}/../other/togl/src
)
if(BRLCAD_ENABLE_OPENGL AND BRLCAD_ENABLE_TK)
if(WIN32)
@@ -77,7 +76,16 @@
BRLCAD_MANAGE_FILES("isst.bat" ${BIN_DIR} EXEC)
endif(WIN32)
BRLCAD_MANAGE_FILES("isst" ${BIN_DIR} EXEC)
+ add_custom_target(isst ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/isst)
+ add_dependencies(isst issttcltk bwish)
+ foreach(item ${pkgIndex_target_list})
+ add_dependencies(isst ${item})
+ endforeach(item ${pkgIndex_target_list})
+ foreach(item ${tclIndex_target_list})
+ add_dependencies(isst ${item})
+ endforeach(item ${tclIndex_target_list})
endif(BRLCAD_ENABLE_OPENGL AND BRLCAD_ENABLE_TK)
+
CMAKEFILES(isst_tcltk.c)
set(adrt_ignore_files
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
