Revision: 54936
http://brlcad.svn.sourceforge.net/brlcad/?rev=54936&view=rev
Author: brlcad
Date: 2013-03-28 05:36:00 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
we're using it now, so compile thread.cpp and link against boost_thread
Modified Paths:
--------------
brlcad/trunk/src/libbu/CMakeLists.txt
Modified: brlcad/trunk/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/CMakeLists.txt 2013-03-28 05:33:01 UTC (rev
54935)
+++ brlcad/trunk/src/libbu/CMakeLists.txt 2013-03-28 05:36:00 UTC (rev
54936)
@@ -3,8 +3,18 @@
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${TCL_INCLUDE_DIRS}
+ ${CMAKE_SOURCE_DIR}/src/other/boost
)
+# No point halting on C++ warnings, we can't do anything about the
+# boost issues (except update boost)
+string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
+if(BUILD_TYPE)
+ set(CMAKE_CXX_FLAGS_${BUILD_TYPE} "${CMAKE_CXX_FLAGS_${BUILD_TYPE}}
-Wno-error")
+else(BUILD_TYPE)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error")
+endif(BUILD_TYPE)
+
# locally used but not needed by users of the library
set(BU_LOCAL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
@@ -81,6 +91,7 @@
str.c
tcl.c
temp.c
+ thread.cpp
timer.c
units.c
vers.c
@@ -93,7 +104,7 @@
xdr.c
)
-BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${TCL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${M_LIBRARY}")
+BRLCAD_ADDLIB(libbu "${LIBBU_SOURCES}"
"${CMAKE_THREAD_LIBS_INIT};${TCL_LIBRARY};${WINSOCK_LIB};${PSAPI_LIB};${M_LIBRARY};boost_thread")
set_target_properties(libbu PROPERTIES VERSION 20.0.1 SOVERSION 20)
get_directory_property(BRLCAD_TCL_BUILD DIRECTORY
${BRLCAD_SOURCE_DIR}/src/other DEFINITION BRLCAD_TCL_BUILD)
if("${BRLCAD_TCL_BUILD}" STREQUAL "ON")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Own the Future-Intel® Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest.
Compete for recognition, cash, and the chance to get your game
on Steam. $5K grand prize plus 10 genre and skill prizes.
Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
