Revision: 77490
http://sourceforge.net/p/brlcad/code/77490
Author: starseeker
Date: 2020-10-19 03:48:31 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
More Windows specific fun - dll files aren't enough for building, we also need
to grab the lib files. Add some notional logic for how to do that...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-19 02:54:29 UTC (rev 77489)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-19 03:48:31 UTC (rev 77490)
@@ -332,6 +332,11 @@
fcfgcpy(TOUT ${extproj} ${extroot} ${fname} ${SHARED_DIR} ${fname})
+ if (MSVC)
+ string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}" ".lib" IMPLIB_FILE
"${IMPLIB_FILE}")
+ fcfgcpy(TOUT ${extproj} ${extroot} ${IMPLIB_FILE} ${LIB_DIR}
${IMPLIB_FILE})
+ endif (MSVC)
+
# Because we're using LINK_TARGET here rather than fname, we need to take
any relative
# directories specified in fname and ppend them to SHARED_DIR. (For other
cases we are
# just feeding fname directly, so there are no such concerns. TODO -
should we just
@@ -340,6 +345,9 @@
ET_target_props(${etarg} "${SHARED_DIR}/${LDIR}" ${LINK_TARGET} SHARED
LINK_TARGET_DEBUG "${LINK_TARGET_DEBUG}")
install(FILES "${CMAKE_BINARY_ROOT}/${SHARED_DIR}/${fname}" DESTINATION
${SHARED_DIR}/${E_SUBDIR})
+ if (MSVC)
+ install(FILES "${CMAKE_BINARY_ROOT}/${LIB_DIR}/${IMPLIB_FILE}"
DESTINATION ${LIB_DIR}/${E_SUBDIR})
+ endif (MSVC)
# Let CMake know there is a target dependency here, despite this being an
import target
add_dependencies(${etarg} ${extproj})
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
