Revision: 77387
http://sourceforge.net/p/brlcad/code/77387
Author: starseeker
Date: 2020-10-09 16:43:00 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Don't make install rules if we're not using the target.
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-09 15:12:44 UTC (rev 77386)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-09 16:43:00 UTC (rev 77387)
@@ -316,8 +316,9 @@
# CMake project, we need to install as either FILES or PROGRAMS
set(TOUT)
+ message("Adding target: ${etarg}")
+
# Handle shared library
- message("Adding target: ${etarg}")
if (E_SHARED)
add_library(${etarg} SHARED IMPORTED GLOBAL)
string(REPLACE "${LIB_DIR}/" "" ENAME ${E_SHARED})
@@ -383,11 +384,12 @@
if (NOT BUILD_STATIC_LIBS)
if (NOT "${slink}" MATCHES ".*${CMAKE_STATIC_LIBRARY_SUFFIX}")
fcfgcpy(TOUT ${extproj} ${extroot} ${LIB_DIR} ${slink} ${ENAME})
+ install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ENAME}"
DESTINATION ${LIB_DIR})
endif (NOT "${slink}" MATCHES ".*${CMAKE_STATIC_LIBRARY_SUFFIX}")
else (NOT BUILD_STATIC_LIBS)
fcfgcpy(TOUT ${extproj} ${extroot} ${LIB_DIR} ${slink} ${ENAME})
+ install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ENAME}"
DESTINATION ${LIB_DIR})
endif (NOT BUILD_STATIC_LIBS)
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ENAME}"
DESTINATION ${LIB_DIR})
endforeach(slink ${E_SYMLINKS})
endif(E_SYMLINKS AND NOT MSVC)
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
