Revision: 75273
          http://sourceforge.net/p/brlcad/code/75273
Author:   starseeker
Date:     2020-04-06 15:24:27 +0000 (Mon, 06 Apr 2020)
Log Message:
-----------
Yeesh.  The zlib prefix exposes another issue - the MPI libraries when building 
with clang pull in a libopen-rte library that links to system zlib.  Apparently 
we'll need to bootstrap MPI if we want to use our bundled zlib in this 
context...

Modified Paths:
--------------
    brlcad/trunk/src/rt/CMakeLists.txt

Modified: brlcad/trunk/src/rt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/rt/CMakeLists.txt  2020-04-06 15:16:57 UTC (rev 75272)
+++ brlcad/trunk/src/rt/CMakeLists.txt  2020-04-06 15:24:27 UTC (rev 75273)
@@ -29,7 +29,7 @@
   set(OPENCL_LIBS ${OPENCL_LIBRARIES})
 endif(BRLCAD_ENABLE_OPENCL)
 
-if(MPI_C_LIBRARIES)
+if(MPI_C_LIBRARIES AND BRLCAD_ENABLE_MPI)
   set(RT_STD_LIBS
     ${CMAKE_THREAD_LIBS_INIT}
     ${MPI_C_LIBRARIES}
@@ -50,7 +50,7 @@
     libicv
     ${M_LIBRARY}
     )
-endif(MPI_C_LIBRARIES)
+endif(MPI_C_LIBRARIES AND BRLCAD_ENABLE_MPI)
 
 BRLCAD_ADDDATA(rtexample.c sample_applications)
 

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to