Revision: 77435
http://sourceforge.net/p/brlcad/code/77435
Author: starseeker
Date: 2020-10-15 01:57:58 +0000 (Thu, 15 Oct 2020)
Log Message:
-----------
Start working on handling Windows special case for bin/lib
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-15 01:49:03 UTC (rev 77434)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-15 01:57:58 UTC (rev 77435)
@@ -314,17 +314,21 @@
# Handle shared library
if (E_SHARED)
+ if (MSVC)
+ set(SHARED_DIR ${BIN_DIR})
+ else (MSVC)
+ set(SHARED_DIR ${LIB_DIR})
+ endif (MSVC)
add_library(${etarg} SHARED IMPORTED GLOBAL)
- string(REPLACE "${LIB_DIR}/" "" ENAME ${E_SHARED})
- fcfgcpy(TOUT ${extproj} ${extroot} ${LIB_DIR} ${E_SHARED} ${ENAME})
+ string(REPLACE "${SHARED_DIR}/" "" ENAME ${E_SHARED})
+ fcfgcpy(TOUT ${extproj} ${extroot} ${SHARED_DIR} ${E_SHARED} ${ENAME})
if (E_LINK_TARGET AND NOT MSVC)
ET_target_props(${etarg} "${E_IMPORT_PREFIX}" ${E_LINK_TARGET}
LINK_TARGET_DEBUG "${LINK_TARGET_DEBUG}")
else (E_LINK_TARGET AND NOT MSVC)
- string(REPLACE "${LIB_DIR}/" "" ENAME ${E_SHARED})
ET_target_props(${etarg} "${E_IMPORT_PREFIX}" ${ENAME} LINK_TARGET_DEBUG
"${LINK_TARGET_DEBUG}")
endif (E_LINK_TARGET AND NOT MSVC)
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_SHARED}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
+ install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_SHARED}" DESTINATION
${SHARED_DIR}/${E_SUBDIR})
# Perform RPath magic
if (E_RPATH AND NOT MSVC)
@@ -342,15 +346,9 @@
else (E_STATIC_LINK_TARGET AND NOT MSVC)
ET_target_props(${etarg}-static "${E_IMPORT_PREFIX}" ${ENAME}
STATIC_LINK_TARGET_DEBUG "${STATIC_LINK_TARGET_DEBUG}" STATIC)
endif (E_STATIC_LINK_TARGET AND NOT MSVC)
- if (MSVC)
- string(REPLACE "${BIN_DIR}/" "" ENAME ${E_STATIC})
- fcfgcpy(TOUT ${extproj} ${extroot} ${BIN_DIR} ${E_STATIC} ${ENAME})
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_STATIC}" DESTINATION
${BIN_DIR}/${E_SUBDIR})
- else (MSVC)
- string(REPLACE "${LIB_DIR}/" "" ENAME ${E_STATIC})
- fcfgcpy(TOUT ${extproj} ${extroot} ${LIB_DIR} ${E_STATIC} ${ENAME})
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_STATIC}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
- endif (MSVC)
+ string(REPLACE "${LIB_DIR}/" "" ENAME ${E_STATIC})
+ fcfgcpy(TOUT ${extproj} ${extroot} ${LIB_DIR} ${E_STATIC} ${ENAME})
+ install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_STATIC}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
# Let CMake know there is a target dependency here, despite this being an
import target
add_dependencies(${etarg}-static ${extproj})
endif (E_STATIC AND BUILD_STATIC_LIBS)
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
