Revision: 77388
http://sourceforge.net/p/brlcad/code/77388
Author: starseeker
Date: 2020-10-09 16:59:55 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Working on install behavior
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.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 16:43:00 UTC (rev 77387)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-09 16:59:55 UTC (rev 77388)
@@ -273,7 +273,7 @@
function(ExternalProject_Target etarg extproj extroot)
- cmake_parse_arguments(E "RPATH"
"EXEC;SHARED;STATIC;LINK_TARGET;LINK_TARGET_DEBUG;STATIC_LINK_TARGET;STATIC_LINK_TARGET_DEBUG"
"SYMLINKS;DEPS" ${ARGN})
+ cmake_parse_arguments(E "RPATH"
"EXEC;SHARED;STATIC;LINK_TARGET;LINK_TARGET_DEBUG;STATIC_LINK_TARGET;STATIC_LINK_TARGET_DEBUG;SUBDIR"
"SYMLINKS;DEPS" ${ARGN})
if(NOT TARGET ${extproj})
message(FATAL_ERROR "${extprog} is not a target")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-09
16:43:00 UTC (rev 77387)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-09
16:59:55 UTC (rev 77388)
@@ -120,12 +120,14 @@
itclIntDecls.h
)
- ExternalProject_ByProducts(itcl ITCL_BLD ${ITCL_INSTDIR} ${LIB_DIR}
${LIB_DIR}
- itcl${ITCL_VERSION}/itcl.tcl
+ ExternalProject_ByProducts(itcl ITCL_BLD ${ITCL_INSTDIR}
${LIB_DIR}/itcl${ITCL_VERSION} ${LIB_DIR}/itcl${ITCL_VERSION}
+ itcl.tcl
)
-
+ ExternalProject_ByProducts(itcl ITCL_BLD ${ITCL_INSTDIR}
${LIB_DIR}/itcl${ITCL_VERSION} ${LIB_DIR}/itcl${ITCL_VERSION}
+ pkgIndex.tcl
+ FIXPATH
+ )
ExternalProject_ByProducts(itcl ITCL_BLD ${ITCL_INSTDIR} ${LIB_DIR}
${LIB_DIR}
- itcl${ITCL_VERSION}/pkgIndex.tcl
itclConfig.sh
FIXPATH
)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-09
16:43:00 UTC (rev 77387)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-09
16:59:55 UTC (rev 77388)
@@ -111,16 +111,16 @@
itkDecls.h
)
- ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR} ${LIB_DIR} ${LIB_DIR}
- itk${ITK_VERSION}/Archetype.itk
- itk${ITK_VERSION}/Toplevel.itk
- itk${ITK_VERSION}/Widget.itk
- itk${ITK_VERSION}/itk.tcl
- itk${ITK_VERSION}/tclIndex
+ ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR}
${LIB_DIR}/itk${ITK_VERSION} ${LIB_DIR}/itk${ITK_VERSION}
+ Archetype.itk
+ Toplevel.itk
+ Widget.itk
+ itk.tcl
+ tclIndex
)
- ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR} ${LIB_DIR} ${LIB_DIR}
- itk${ITK_VERSION}/pkgIndex.tcl
+ ExternalProject_ByProducts(itk ITK_BLD ${ITK_INSTDIR}
${LIB_DIR}/itk${ITK_VERSION} ${LIB_DIR}/itk${ITK_VERSION}
+ pkgIndex.tcl
FIXPATH
)
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
