Revision: 77662
http://sourceforge.net/p/brlcad/code/77662
Author: starseeker
Date: 2020-10-31 11:58:13 +0000 (Sat, 31 Oct 2020)
Log Message:
-----------
Ninja on Windows looks like it's going to be good at spotting dependency
issues, since we don't have zlib.h from the system to mask a missing zlib.h
from the bundled copy...
Modified Paths:
--------------
brlcad/branches/extbuild/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/extbuild/src/rt/CMakeLists.txt
Modified: brlcad/branches/extbuild/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/BRLCAD_Targets.cmake 2020-10-31
11:31:23 UTC (rev 77661)
+++ brlcad/branches/extbuild/misc/CMake/BRLCAD_Targets.cmake 2020-10-31
11:58:13 UTC (rev 77662)
@@ -527,6 +527,12 @@
# Extra static lib specific work
if(L_STATIC OR (BUILD_STATIC_LIBS AND NOT L_SHARED))
+ # We need to make sure the target depends on any targets in the libslist
+ foreach(ll ${libslist})
+ if (TARGET ${ll})
+ add_dependencies(${libstatic} ${ll})
+ endif (TARGET ${ll})
+ endforeach(ll ${libslist})
set_target_properties(${libstatic} PROPERTIES FOLDER "BRL-CAD Static
Libraries${SUBFOLDER}")
VALIDATE_STYLE("${libstatic}" "${srcslist};${L_STATIC_SRCS}")
if(NOT L_NO_INSTALL)
Modified: brlcad/branches/extbuild/src/rt/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/rt/CMakeLists.txt 2020-10-31 11:31:23 UTC
(rev 77661)
+++ brlcad/branches/extbuild/src/rt/CMakeLists.txt 2020-10-31 11:58:13 UTC
(rev 77662)
@@ -23,7 +23,7 @@
worker.c
)
-BRLCAD_ADDLIB(librtuif "${LIBRTUIF_SOURCES}" "${M_LIBRARY}" STATIC NO_INSTALL)
+BRLCAD_ADDLIB(librtuif "${LIBRTUIF_SOURCES}" "librt;${M_LIBRARY}" STATIC
NO_INSTALL)
if(BRLCAD_ENABLE_OPENCL)
set(OPENCL_LIBS ${OPENCL_LIBRARIES})
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
