Revision: 77735
http://sourceforge.net/p/brlcad/code/77735
Author: starseeker
Date: 2020-11-13 03:21:44 +0000 (Fri, 13 Nov 2020)
Log Message:
-----------
Adjust pkgIndex.tcl generation for tkhtml and tktable.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt
brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt
Modified: brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt 2020-11-12
21:46:48 UTC (rev 77734)
+++ brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt 2020-11-13
03:21:44 UTC (rev 77735)
@@ -10,6 +10,21 @@
${X11_INCLUDE_DIR}
)
+if (CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BINARY_ROOT "${CMAKE_BINARY_DIR}/$<CONFIG>")
+else (CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BINARY_ROOT "${CMAKE_BINARY_DIR}")
+endif (CMAKE_CONFIGURATION_TYPES)
+
+if(NOT SHARED_DIR)
+ if(NOT WIN32)
+ set(SHARED_DIR lib)
+ else(NOT WIN32)
+ set(SHARED_DIR bin)
+ endif(NOT WIN32)
+endif(NOT SHARED_DIR)
+
+
set(TKHTML_PKGNAME Tkhtml)
set(TKHTML_PKGVERSION "3.0")
@@ -84,8 +99,13 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
-include(TCL_PKGINDEX)
-TCL_PKGINDEX(Tkhtml ${TKHTML_PKGNAME} ${TKHTML_PKGVERSION})
+# Create pkgIndex.tcl files
+file(GENERATE
+ OUTPUT
"${CMAKE_BINARY_ROOT}/${LIB_DIR}/${TKHTML_PKGNAME}${TKHTML_PKGVERSION}/pkgIndex.tcl"
+ CONTENT "
+package ifneeded Tkhtml ${TKHTML_PKGVERSION} [list load [file join $dir
../../${SHARED_DIR} $<TARGET_FILE_NAME:Tkhtml>] Tkhtml]
+")
+install(FILES
"${CMAKE_BINARY_ROOT}/${LIB_DIR}/${TKHTML_PKGNAME}${TKHTML_PKGVERSION}/pkgIndex.tcl"
DESTINATION ${LIB_DIR}/${TKHTML_PKGNAME}${TKHTML_PKGVERSION})
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tkhtml.n
Modified: brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt 2020-11-12
21:46:48 UTC (rev 77734)
+++ brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt 2020-11-13
03:21:44 UTC (rev 77735)
@@ -20,6 +20,20 @@
${X11_INCLUDE_DIR}
)
+if (CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BINARY_ROOT "${CMAKE_BINARY_DIR}/$<CONFIG>")
+else (CMAKE_CONFIGURATION_TYPES)
+ set(CMAKE_BINARY_ROOT "${CMAKE_BINARY_DIR}")
+endif (CMAKE_CONFIGURATION_TYPES)
+
+if(NOT SHARED_DIR)
+ if(NOT WIN32)
+ set(SHARED_DIR lib)
+ else(NOT WIN32)
+ set(SHARED_DIR bin)
+ endif(NOT WIN32)
+endif(NOT SHARED_DIR)
+
set(TKTABLE_PKGNAME Tktable)
set(TKTABLE_PKGVERSION "2.10")
@@ -79,9 +93,14 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
-# Create the pkgIndex.tcl file.
-include(TCL_PKGINDEX)
-TCL_PKGINDEX(Tktable ${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION})
+# Create pkgIndex.tcl files
+file(GENERATE
+ OUTPUT
"${CMAKE_BINARY_ROOT}/${LIB_DIR}/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}/pkgIndex.tcl"
+ CONTENT "
+ package ifneeded Tktable ${TKTABLE_PKGVERSION} [list load [file join $dir
../../${SHARED_DIR} $<TARGET_FILE_NAME:Tktable>] Tktable]
+ "
+ )
+install(FILES
"${CMAKE_BINARY_ROOT}/${LIB_DIR}/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION}/pkgIndex.tcl"
DESTINATION ${LIB_DIR}/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/license.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
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
