Revision: 55572
http://sourceforge.net/p/brlcad/code/55572
Author: d_rossberg
Date: 2013-05-27 10:49:38 +0000 (Mon, 27 May 2013)
Log Message:
-----------
link p2t with zlib-static if a brlcad.dll should be build
Modified Paths:
--------------
brlcad/trunk/src/other/poly2tri/CMakeLists.txt
Modified: brlcad/trunk/src/other/poly2tri/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/poly2tri/CMakeLists.txt 2013-05-24 21:02:44 UTC
(rev 55571)
+++ brlcad/trunk/src/other/poly2tri/CMakeLists.txt 2013-05-27 10:49:38 UTC
(rev 55572)
@@ -80,7 +80,13 @@
# msvc does not append 'lib' - do it here to have consistent name
set_target_properties(${P2T_LIB_NAME_STATIC} PROPERTIES PREFIX "lib")
endif()
- target_link_libraries(${P2T_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
+
+ if(BRLCAD_ENABLE_BRLCAD_LIBRARY AND ${CMAKE_PROJECT_NAME}_ZLIB_BUILD AND NOT
${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ target_link_libraries(${P2T_LIB_NAME_STATIC} zlib-static ${M_LIBRARY})
+ else(BRLCAD_ENABLE_BRLCAD_LIBRARY AND ${CMAKE_PROJECT_NAME}_ZLIB_BUILD AND
NOT ${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+ target_link_libraries(${P2T_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY})
+ endif(BRLCAD_ENABLE_BRLCAD_LIBRARY AND ${CMAKE_PROJECT_NAME}_ZLIB_BUILD AND
NOT ${CMAKE_PROJECT_NAME}-ENABLE_SYSTEM_LIBS_ONLY)
+
install(TARGETS ${P2T_LIB_NAME_STATIC}
RUNTIME DESTINATION ${BIN_DIR}
LIBRARY DESTINATION ${LIB_DIR}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
