Revision: 44594
http://brlcad.svn.sourceforge.net/brlcad/?rev=44594&view=rev
Author: starseeker
Date: 2011-05-10 13:08:08 +0000 (Tue, 10 May 2011)
Log Message:
-----------
See if a togl stub library works for Windows.
Modified Paths:
--------------
brlcad/trunk/src/adrt/CMakeLists.txt
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/togl/src/CMakeLists.txt
Modified: brlcad/trunk/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/adrt/CMakeLists.txt 2011-05-09 20:50:44 UTC (rev
44593)
+++ brlcad/trunk/src/adrt/CMakeLists.txt 2011-05-10 13:08:08 UTC (rev
44594)
@@ -79,7 +79,11 @@
)
IF(TOGL_LIBRARIES)
add_library(issttcltk isst_tcltk.c)
- target_link_libraries(issttcltk librender ${TCL_LIBRARIES}
${TOGL_LIBRARIES})
+ IF(WIN32)
+ target_link_libraries(issttcltk librender ${TCL_LIBRARIES}
${TOGL_STUB_LIBRARIES})
+ ELSE(WIN32)
+ target_link_libraries(issttcltk librender ${TCL_LIBRARIES}
${TOGL_LIBRARIES})
+ ENDIF(WIN32)
INSTALL(TARGETS issttcltk DESTINATION
${${CMAKE_PROJECT_NAME}_INSTALL_LIB_DIR}/isst0.1)
GET_TARGET_PROPERTY(ISSTTCL_LIBLOCATION issttcltk
LOCATION_${CMAKE_BUILD_TYPE})
GET_FILENAME_COMPONENT(ISSTTCL_LIBNAME ${ISSTTCL_LIBLOCATION} NAME)
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-05-09 20:50:44 UTC (rev
44593)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-05-10 13:08:08 UTC (rev
44594)
@@ -1006,6 +1006,7 @@
# some logic to both look for package require and the C library, as both APIs
will be needed.
IF(BRLCAD-ENABLE_OPENGL)
SET(TOGL_LIBRARIES togl CACHE STRING "TOGL_LIBRARIES" FORCE)
+ SET(TOGL_STUB_LIBRARIES toglstub CACHE STRING "TOGL_STUB_LIBRARIES"
FORCE)
SET(TOGL_INCLUDE_DIRS
"${CMAKE_CURRENT_BINARY_DIR}/togl/include;${CMAKE_CURRENT_SOURCE_DIR}/togl/include"
CACHE STRING "Togl include path" FORCE)
MARK_AS_ADVANCED(TOGL_LIBRARIES)
MARK_AS_ADVANCED(TOGL_INCLUDE_DIRS)
Modified: brlcad/trunk/src/other/togl/src/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/togl/src/CMakeLists.txt 2011-05-09 20:50:44 UTC
(rev 44593)
+++ brlcad/trunk/src/other/togl/src/CMakeLists.txt 2011-05-10 13:08:08 UTC
(rev 44594)
@@ -106,6 +106,10 @@
ENDIF(WIN32)
install(TARGETS togl DESTINATION lib)
+add_library(toglstub STATIC ${CMAKE_CURRENT_BINARY_DIR}/toglStubInit.c
toglStubLib.c)
+ADD_DEPENDENCIES(toglstub togl_stubs_gen)
+install(TARGETS toglstub DESTINATION lib)
+
# Create the pkgIndex.tcl file.
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${TOGL_PKGNAME} ${TOGL_PKGVERSION} [list load [file join $dir ..
libtogl${CMAKE_SHARED_LIBRARY_SUFFIX}] togl]")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
lib/${TOGL_PKGNAME}${TOGL_PKGVERSION})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Achieve unprecedented app performance and reliability
What every C/C++ and Fortran developer should know.
Learn how Intel has extended the reach of its next-generation tools
to help boost performance applications - inlcuding clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
