Revision: 77630
http://sourceforge.net/p/brlcad/code/77630
Author: starseeker
Date: 2020-10-24 03:34:09 +0000 (Sat, 24 Oct 2020)
Log Message:
-----------
Got bit again by treating $<CONFIG> as an indication of multiconfig - it gets
set when single config builds set CMAKE_BUILD_TYPE as well. Update accordingly.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
Modified:
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-10-24 03:15:48 UTC (rev 77629)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-10-24 03:34:09 UTC (rev 77630)
@@ -35,12 +35,21 @@
# time.
function(fcfgcpy outvar extproj root ofile dir tfile)
string(REPLACE "${CMAKE_BINARY_DIR}/" "" rdir "${dir}")
- add_custom_command(
- OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${rdir}/${tfile}"
- COMMAND ${CMAKE_COMMAND} -DSRC="${root}/${rdir}/${ofile}"
-DDEST="${CMAKE_BINARY_DIR}/$<CONFIG>/${rdir}/${tfile}" -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
- DEPENDS ${extproj}
- )
- set(TOUT ${TOUT} "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${rdir}/${tfile}")
+ if (CMAKE_CONFIGURATION_TYPES)
+ add_custom_command(
+ OUTPUT "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${rdir}/${tfile}"
+ COMMAND ${CMAKE_COMMAND} -DSRC="${root}/${rdir}/${ofile}"
-DDEST="${CMAKE_BINARY_DIR}/$<CONFIG>/${rdir}/${tfile}" -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
+ DEPENDS ${extproj}
+ )
+ set(TOUT ${TOUT}
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${rdir}/${tfile}")
+ else (CMAKE_CONFIGURATION_TYPES)
+ add_custom_command(
+ OUTPUT "${CMAKE_BINARY_DIR}/${rdir}/${tfile}"
+ COMMAND ${CMAKE_COMMAND} -DSRC="${root}/${rdir}/${ofile}"
-DDEST="${CMAKE_BINARY_DIR}/${rdir}/${tfile}" -P
"${CMAKE_BINARY_DIR}/CMakeFiles/cp.cmake"
+ DEPENDS ${extproj}
+ )
+ set(TOUT ${TOUT} "${CMAKE_BINARY_DIR}/${rdir}/${tfile}")
+ endif (CMAKE_CONFIGURATION_TYPES)
set(${outvar} ${TOUT} PARENT_SCOPE)
endfunction(fcfgcpy file)
@@ -117,11 +126,10 @@
# IMPORTED_NO_SONAME to get working linking for what we're trying to do
# here. Without that property set, build dir copies of libraries will use
# an incorrect relative link and fail to find the library.
- set_property(TARGET ${etarg} APPEND PROPERTY IMPORTED_CONFIGURATIONS
NOCONFIG)
set_target_properties(${etarg} PROPERTIES
IMPORTED_NO_SONAME TRUE
- IMPORTED_LOCATION_NOCONFIG
"${CMAKE_BINARY_DIR}/${REL_DIR}/${LINK_TARGET}"
- IMPORTED_SONAME_NOCONFIG "${LINK_TARGET}"
+ IMPORTED_LOCATION "${CMAKE_BINARY_DIR}/${REL_DIR}/${LINK_TARGET}"
+ IMPORTED_SONAME "${LINK_TARGET}"
)
# For Windows, IMPORTED_IMPLIB is important for shared libraries.
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
