Revision: 77459
http://sourceforge.net/p/brlcad/code/77459
Author: starseeker
Date: 2020-10-15 18:34:28 +0000 (Thu, 15 Oct 2020)
Log Message:
-----------
Tweak generated target properties - this probably needs one more cleanup
refactor.
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 17:19:06 UTC (rev 77458)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-15 18:34:28 UTC (rev 77459)
@@ -162,21 +162,21 @@
# The config variables are the ones set in this mode.
if(ET_STATIC)
set(IMPORT_PREFIX "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
- if("${CFG_TYPE_UPPER}" STREQUAL "DEBUG")
+ if("${CFG_TYPE_UPPER}" STREQUAL "DEBUG" AND ET_STATIC_LINK_TARGET_DEBUG)
set(LINK_TARGET ${ET_STATIC_LINK_TARGET_DEBUG})
- else("${CFG_TYPE_UPPER}" STREQUAL "DEBUG")
+ else()
set(LINK_TARGET ${IN_LINK_TARGET})
- endif("${CFG_TYPE_UPPER}" STREQUAL "DEBUG")
+ endif()
elseif(ET_EXEC)
set(IMPORT_PREFIX "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
set(LINK_TARGET ${IN_LINK_TARGET})
else()
set(IMPORT_PREFIX "${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
- if("${CFG_TYPE_UPPER}" STREQUAL "DEBUG")
+ if("${CFG_TYPE_UPPER}" STREQUAL "DEBUG" AND ET_LINK_TARGET_DEBUG)
set(LINK_TARGET ${ET_LINK_TARGET_DEBUG})
- else("${CFG_TYPE_UPPER}" STREQUAL "DEBUG")
+ else()
set(LINK_TARGET ${IN_LINK_TARGET})
- endif("${CFG_TYPE_UPPER}" STREQUAL "DEBUG")
+ endif()
endif(ET_STATIC)
if(IN_IMPORT_PREFIX)
@@ -184,6 +184,7 @@
endif(IN_IMPORT_PREFIX)
set_target_properties(${etarg} PROPERTIES
+ IMPORTED_NO_SONAME TRUE
IMPORTED_LOCATION_${CFG_TYPE_UPPER} "${IMPORT_PREFIX}/${LINK_TARGET}"
IMPORTED_SONAME_${CFG_TYPE_UPPER} "${LINK_TARGET}"
)
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
