Revision: 70423
http://sourceforge.net/p/brlcad/code/70423
Author: brlcad
Date: 2017-11-21 07:51:11 +0000 (Tue, 21 Nov 2017)
Log Message:
-----------
may need work on Windows, but this fixes the Mac build. architecturally, it
should be a subbuild, not bundled into the lib as sources. this way also lets
warnings be trivially disabled with the macro src/other uses.
Modified Paths:
--------------
brlcad/trunk/src/libged/CMakeLists.txt
brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt
Modified: brlcad/trunk/src/libged/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/CMakeLists.txt 2017-11-21 07:31:32 UTC (rev
70422)
+++ brlcad/trunk/src/libged/CMakeLists.txt 2017-11-21 07:51:11 UTC (rev
70423)
@@ -347,7 +347,11 @@
BRLCAD_LIB_INCLUDE_DIRS(ged GED_INCLUDE_DIRS GED_LOCAL_INCLUDE_DIRS)
-BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}"
"libwdb;librt;libnmg;libfb;libbg;libbn;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
+if(BRLCAD_ENABLE_BULLET)
+ set(CADBULLET_LIBRARY cadbullet)
+endif(BRLCAD_ENABLE_BULLET)
+
+BRLCAD_ADDLIB(libged "${LIBGED_SOURCES}"
"libwdb;librt;libnmg;libfb;libbg;libbn;libbu;libicv;libanalyze;${LIBGED_CMD_LIBS_LIST};${CADBULLET_LIBRARY};${REGEX_LIBRARY};${WINSOCK_LIB};${CLIPPER_LIBRARY};${M_LIBRARY}")
SET_TARGET_PROPERTIES(libged PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(CPP_DLL_DEFINES)
Modified: brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt 2017-11-21
07:31:32 UTC (rev 70422)
+++ brlcad/trunk/src/libged/simulate/bullet/CMakeLists.txt 2017-11-21
07:51:11 UTC (rev 70423)
@@ -401,16 +401,8 @@
)
if(BRLCAD_ENABLE_BULLET)
- set(LIBGED_SOURCES ${Bullet_SRCS} ${Bullet_HDRS})
-
- include(CheckCXXCompilerFlag)
- check_cxx_compiler_flag(-Wno-error NOERROR_FLAG_CXX)
- check_cxx_compiler_flag(-w NOWARN_FLAG_CXX)
- if(NOERROR_FLAG_CXX AND NOWARN_FLAG_CXX)
- foreach(srcfile ${Bullet_SRCS})
- set_property(SOURCE ${srcfile} APPEND PROPERTY COMPILE_FLAGS "-w
-Wno-error")
- endforeach(srcfile ${Bullet_SRCS})
- endif(NOERROR_FLAG_CXX AND NOWARN_FLAG_CXX)
+ add_library(cadbullet ${Bullet_SRCS} ${Bullet_HDRS})
+ DISABLE_WARNINGS()
else(BRLCAD_ENABLE_BULLET)
CMAKEFILES(${Bullet_SRCS})
CMAKEFILES(${Bullet_HDRS})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
