[brlcad-commits] SF.net SVN: brlcad:[50424] brlcad/trunk/src
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2012-05-03 20:29:54
|
Revision: 50424 http://brlcad.svn.sourceforge.net/brlcad/?rev=50424&view=rev Author: brlcad Date: 2012-05-03 17:22:40 +0000 (Thu, 03 May 2012) Log Message: ----------- two of our C libs use C++ libraries, so specify the stl dependency on their linker line in case we're going through ccache, a C compiler, or some other configuration where we need to explicitly link that library. needs to be abstracted in order to support stlport, but completes a ccache build for now. Modified Paths: -------------- brlcad/trunk/src/libpc/CMakeLists.txt brlcad/trunk/src/librt/CMakeLists.txt Modified: brlcad/trunk/src/libpc/CMakeLists.txt =================================================================== --- brlcad/trunk/src/libpc/CMakeLists.txt 2012-05-03 17:16:50 UTC (rev 50423) +++ brlcad/trunk/src/libpc/CMakeLists.txt 2012-05-03 17:22:40 UTC (rev 50424) @@ -59,7 +59,7 @@ -DOBJ_BREP=1 ) -BRLCAD_ADDLIB(libpc "${LIBPC_SOURCES}" libbu;${OPENNURBS_LIBRARY}) +BRLCAD_ADDLIB(libpc "${LIBPC_SOURCES}" "libbu;${OPENNURBS_LIBRARY};stdc++") SET_TARGET_PROPERTIES(libpc PROPERTIES VERSION 19.0.1 SOVERSION 19) #BRLCAD_ADDEXEC(solver_test solver_test.cpp libpc NO_INSTALL) Modified: brlcad/trunk/src/librt/CMakeLists.txt =================================================================== --- brlcad/trunk/src/librt/CMakeLists.txt 2012-05-03 17:16:50 UTC (rev 50423) +++ brlcad/trunk/src/librt/CMakeLists.txt 2012-05-03 17:22:40 UTC (rev 50424) @@ -283,7 +283,7 @@ endif(CPP_DLL_DEFINES) set_property(GLOBAL PROPERTY RT_DEFINES "${RT_DEFINES}") -BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}" "libbn;libbu;${OPENNURBS_LIBRARY};${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB}") +BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}" "libbn;libbu;${OPENNURBS_LIBRARY};${REGEX_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};stdc++") if(BUILD_STATIC_LIBS) SET_PROPERTY(TARGET librt-static APPEND PROPERTY COMPILE_DEFINITIONS "OBJ_BREP=1") endif(BUILD_STATIC_LIBS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |