Revision: 75752
http://sourceforge.net/p/brlcad/code/75752
Author: starseeker
Date: 2020-05-08 01:08:14 +0000 (Fri, 08 May 2020)
Log Message:
-----------
AH! A subtle problem with the ENABLE_ALL build - if the build decided to go
ahead and do libged-obj as one of the first builds (which it could because the
obj build didn't have dependencies set up - they're on the lib target itself)
and it was using the bundled png, it wouldn't be able to build successfully
because pnglibconf.h is generated by the png build. Since it wasn't firing,
libged-obj would only complete successfully if it could a) find a pnglibconf.h
somewhere else (which it apparently does on some systems, even though with
ENABLE_ALL it would be better not to) or b) the ordering the build tool picked
happend to produce pnglibconf.h before getting the the libged-obj build. Fix
this by checking the libs list for build targets, and if any are found make the
object library target dependent on them so we don't start on the lib objects
until everything they depend on is done.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-08 00:37:48 UTC
(rev 75751)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-05-08 01:08:14 UTC
(rev 75752)
@@ -464,6 +464,13 @@
add_library(${libname}-obj OBJECT ${lsrcslist})
set(lsrcslist $<TARGET_OBJECTS:${libname}-obj>)
set_target_properties(${libname}-obj PROPERTIES FOLDER "BRL-CAD OBJECT
Libraries${SUBFOLDER}")
+ if(NOT "${libslist}" STREQUAL "" AND NOT "${libslist}" STREQUAL "NONE")
+ foreach(ll ${libslist})
+ if (TARGET ${ll})
+ add_dependencies(${libname}-obj ${ll})
+ endif (TARGET ${ll})
+ endforeach(ll ${libslist})
+ endif(NOT "${libslist}" STREQUAL "" AND NOT "${libslist}" STREQUAL "NONE")
endif(USE_OBJECT_LIBS)
if(L_SHARED OR (BUILD_SHARED_LIBS AND NOT L_STATIC))
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
