Revision: 53816
http://brlcad.svn.sourceforge.net/brlcad/?rev=53816&view=rev
Author: starseeker
Date: 2012-11-26 16:30:35 +0000 (Mon, 26 Nov 2012)
Log Message:
-----------
Since it's the Eigen headers introducing the shadow warnings, use pragmas to
shush them.
Modified Paths:
--------------
brlcad/trunk/src/libnurbs/CMakeLists.txt
brlcad/trunk/src/libnurbs/opennurbs_fit.h
brlcad/trunk/src/librt/CMakeLists.txt
Modified: brlcad/trunk/src/libnurbs/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libnurbs/CMakeLists.txt 2012-11-26 15:37:31 UTC (rev
53815)
+++ brlcad/trunk/src/libnurbs/CMakeLists.txt 2012-11-26 16:30:35 UTC (rev
53816)
@@ -13,7 +13,7 @@
${CMAKE_CURRENT_SOURCE_DIR}
${REGEX_INCLUDE_DIR}
${TNT_INCLUDE_DIR}
- #${BRLCAD_SOURCE_DIR}/src/other/Eigen
+ ${BRLCAD_SOURCE_DIR}/src/other/Eigen
)
BRLCAD_LIB_INCLUDE_DIRS(nurbs NURBS_INCLUDE_DIRS NURBS_LOCAL_INCLUDE_DIRS)
@@ -44,10 +44,6 @@
set_property(GLOBAL PROPERTY libnurbs_DEFINES "${libnurbs_DEFINES}")
BRLCAD_ADDLIB(libnurbs "${LIBNURBS_SOURCES}"
"libbn;libbu;${OPENNURBS_LIBRARY};${ZLIB_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}"
NOSTRICTCXX)
-# Line below used to suppress Eigen specific warnings when working on new
-# fitting code - these are temporary, and will disappear once Eigen is
-# properly fixed.
-#set_property(TARGET libnurbs APPEND PROPERTY COMPILE_FLAGS "-Wno-shadow
-Wno-float-equal")
if(BUILD_STATIC_LIBS)
set_property(TARGET libnurbs-static APPEND PROPERTY COMPILE_DEFINITIONS
"OBJ_BREP=1")
Modified: brlcad/trunk/src/libnurbs/opennurbs_fit.h
===================================================================
--- brlcad/trunk/src/libnurbs/opennurbs_fit.h 2012-11-26 15:37:31 UTC (rev
53815)
+++ brlcad/trunk/src/libnurbs/opennurbs_fit.h 2012-11-26 16:30:35 UTC (rev
53816)
@@ -45,6 +45,12 @@
#include <map>
#include <stdio.h>
+#if defined(__GNUC__)
+# pragma message "Disabling GCC shadow warnings via pragma due to Eigen
headers..."
+# pragma message "Disabling GCC float equality comparison warnings via pragma
due to Eigen headers..."
+#endif
+#pragma GCC diagnostic ignored "-Wshadow"
+#pragma GCC diagnostic ignored "-Wfloat-equal"
#undef Success
#include <Eigen/StdVector>
#undef Success
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2012-11-26 15:37:31 UTC (rev
53815)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2012-11-26 16:30:35 UTC (rev
53816)
@@ -302,13 +302,12 @@
install(FILES librt.3 DESTINATION ${MAN_DIR}/man3)
CMAKEFILES(Makefile.am)
-#include_directories(
-# ${CMAKE_SOURCE_DIR}/src/other/Eigen
-# ${CMAKE_CURRENT_SOURCE_DIR}/../libnurbs
-# )
+include_directories(
+ ${CMAKE_SOURCE_DIR}/src/other/Eigen
+ ${CMAKE_CURRENT_SOURCE_DIR}/../libnurbs
+ )
#BRLCAD_ADDEXEC(test_botpatches test_botpatches.cpp
"librt;libwdb;libnurbs;libbu" NOSTRICT NO_INSTALL)
-#SET_PROPERTY(TARGET test_botpatches PROPERTY COMPILE_FLAGS "-Wno-shadow
-Wno-float-equal -Wno-error")
#BRLCAD_ADDEXEC(test_nurbsfit test_nurbsfit.cpp "librt;libwdb;libnurbs;libbu"
NOSTRICT NO_INSTALL)
#BRLCAD_ADDEXEC(test_subdivision test_subdivision.cpp
"librt;libwdb;libnurbs;libbu" NOSTRICT NO_INSTALL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
