Revision: 77493
http://sourceforge.net/p/brlcad/code/77493
Author: starseeker
Date: 2020-10-19 04:21:49 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
More adjustments
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/itk3/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-19
04:11:30 UTC (rev 77492)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-19
04:21:49 UTC (rev 77493)
@@ -68,6 +68,7 @@
set(ITCL_DEPS)
if (TARGET tcl_stage)
+ set(TCL_TARGET ON)
list(APPEND ITCL_DEPS tcl_stage)
list(APPEND ITCL_DEPS tclstub_stage)
list(APPEND ITCL_DEPS tclsh_exe_stage)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
2020-10-19 04:11:30 UTC (rev 77492)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl3/CMakeLists.txt
2020-10-19 04:21:49 UTC (rev 77493)
@@ -205,7 +205,7 @@
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl"
CONTENT "
if {![package vsatisfies [package provide Tcl] ${TCL_VERSION}]} {return}
-package ifneeded Itcl ${ITCL_VERSION} [list load [file join $dir
$<TARGET_FILE_NAME:itcl${ITCL_VERSION}>] Itcl]
+package ifneeded Itcl ${ITCL_VERSION} [list load [file join $dir
../../${SHARED_LIB}/itcl${ITCL_VERSION}
$<TARGET_FILE_NAME:itcl${ITCL_VERSION}>] Itcl]
")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
${LIB_DIR}/itcl${ITCL_VERSION})
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk3/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk3/CMakeLists.txt
2020-10-19 04:11:30 UTC (rev 77492)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk3/CMakeLists.txt
2020-10-19 04:21:49 UTC (rev 77493)
@@ -192,7 +192,7 @@
set_property(TARGET itk${ITK_VERSION} APPEND PROPERTY COMPILE_DEFINITIONS
USE_ITCL_STUBS)
set_property(TARGET itk${ITK_VERSION} APPEND PROPERTY COMPILE_DEFINITIONS
USE_TK_STUBS)
install(TARGETS itk${ITK_VERSION}
- RUNTIME DESTINATION ${BIN_DIR}
+ RUNTIME DESTINATION ${BIN_DIR}/itk${ITK_VERSION}
LIBRARY DESTINATION ${SHARED_DIR}/itk${ITK_VERSION}
ARCHIVE DESTINATION ${LIB_DIR}/itk${ITK_VERSION})
@@ -202,7 +202,7 @@
set_property(TARGET itkstub APPEND PROPERTY COMPILE_DEFINITIONS USE_ITCL_STUBS)
set_property(TARGET itkstub APPEND PROPERTY COMPILE_DEFINITIONS USE_TK_STUBS)
install(TARGETS itkstub
- RUNTIME DESTINATION ${BIN_DIR}
+ RUNTIME DESTINATION ${BIN_DIR}/itk${ITK_VERSION}
LIBRARY DESTINATION ${LIB_DIR}/itk${ITK_VERSION}
ARCHIVE DESTINATION ${LIB_DIR}/itk${ITK_VERSION})
@@ -211,7 +211,7 @@
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl"
CONTENT "
if {![package vsatisfies [package provide Tcl] ${TCL_VERSION}]} {return}
-package ifneeded Itk ${ITK_VERSION} [list load [file join $dir
$<TARGET_FILE_NAME:itk${ITK_VERSION}>] Itk]
+package ifneeded Itk ${ITK_VERSION} [list load [file join $dir
../../${SHARED_DIR}/itk${ITK_VERSION} $<TARGET_FILE_NAME:itk${ITK_VERSION}>]
Itk]
")
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
${LIB_DIR}/itk${ITK_VERSION})
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
