Revision: 77497
http://sourceforge.net/p/brlcad/code/77497
Author: starseeker
Date: 2020-10-19 14:34:35 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
Correct property setting for MSVC case
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 13:59:23 UTC (rev 77496)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-19 14:34:35 UTC (rev 77497)
@@ -145,6 +145,7 @@
# when building - pointing out the dll isn't enough by itself.
if(ET_SHARED AND MSVC)
string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}" ".lib" IMPLIB_FILE
"${LINK_TARGET}")
+ string(REPLACE "${SHARED_DIR}" "${LIB_DIR}" REL_DIR "${REL_DIR}")
set_target_properties(${etarg} PROPERTIES
IMPORTED_IMPLIB_NOCONFIG "${CMAKE_BINARY_DIR}/${REL_DIR}/${IMPLIB_FILE}"
)
@@ -182,6 +183,7 @@
# when building - pointing out the dll isn't enough by itself.
if(ET_SHARED AND MSVC)
string(REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}" ".lib" IMPLIB_FILE
"${LINK_TARGET}")
+ string(REPLACE "${SHARED_DIR}" "${LIB_DIR}" REL_DIR "${REL_DIR}")
set_target_properties(${etarg} PROPERTIES
IMPORTED_IMPLIB_${CFG_TYPE_UPPER}
"${CMAKE_BINARY_DIR}/${CFG_TYPE}/${REL_DIR}/${IMPLIB_FILE}"
)
@@ -291,7 +293,7 @@
unset(LINK_TARGET)
unset(LINK_TARGET_DEBUG)
- if ("${etype}" STREQUAL "SHARED" AND NOT MSVC)
+ if ("${etype}" STREQUAL "SHARED")
if (E_LINK_TARGET)
set(LINK_TARGET "${E_LINK_TARGET}")
@@ -309,7 +311,7 @@
set(LINK_TARGET_DEBUG "${LINK_TARGET}")
endif ()
- endif ("${etype}" STREQUAL "SHARED" AND NOT MSVC)
+ endif ("${etype}" STREQUAL "SHARED")
# Create imported target - need to both make the target itself
# and set the necessary properties. See also
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
