Revision: 44623
http://brlcad.svn.sourceforge.net/brlcad/?rev=44623&view=rev
Author: starseeker
Date: 2011-05-17 19:41:44 +0000 (Tue, 17 May 2011)
Log Message:
-----------
Use LIB_DIR variable for install, so Windows gets things where it expects them.
Modified Paths:
--------------
brlcad/trunk/src/other/togl/CMakeLists.txt
brlcad/trunk/src/other/togl/src/CMakeLists.txt
Modified: brlcad/trunk/src/other/togl/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/togl/CMakeLists.txt 2011-05-17 17:46:20 UTC (rev
44622)
+++ brlcad/trunk/src/other/togl/CMakeLists.txt 2011-05-17 19:41:44 UTC (rev
44623)
@@ -11,6 +11,10 @@
find_package(GL)
find_package(TCL)
+IF(NOT LIB_DIR)
+ SET(LIB_DIR lib)
+ENDIF(LIB_DIR)
+
# If we have only a target and not a full working exec, it's up to
# a parent CMake system to define TK_SYSTEM_GRAPHICS
get_filename_component(FULL_EXEC_PATH ${TCL_WISH_EXECUTABLE} ABSOLUTE)
Modified: brlcad/trunk/src/other/togl/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/togl/src/CMakeLists.txt 2011-05-17 17:46:20 UTC
(rev 44622)
+++ brlcad/trunk/src/other/togl/src/CMakeLists.txt 2011-05-17 19:41:44 UTC
(rev 44623)
@@ -104,11 +104,11 @@
ELSE(WIN32)
target_link_libraries(togl ${TCL_LIBRARIES} ${X11_LIBRARIES}
${OPENGL_LIBRARIES})
ENDIF(WIN32)
-install(TARGETS togl DESTINATION lib)
+install(TARGETS togl DESTINATION ${LIB_DIR})
add_library(toglstub STATIC ${CMAKE_CURRENT_BINARY_DIR}/toglStubInit.c
toglStubLib.c)
ADD_DEPENDENCIES(toglstub togl_stubs_gen)
-install(TARGETS toglstub DESTINATION lib)
+install(TARGETS toglstub DESTINATION ${LIB_DIR})
MARK_AS_ADVANCED(TOGL_STUB_LIBRARIES)
# Create the pkgIndex.tcl file.
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
