Revision: 77509
http://sourceforge.net/p/brlcad/code/77509
Author: starseeker
Date: 2020-10-19 22:26:38 +0000 (Mon, 19 Oct 2020)
Log Message:
-----------
Clean up the iwidgets CMake a bit.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets/CMakeLists.txt
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets/CMakeLists.txt
2020-10-19 22:11:04 UTC (rev 77508)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets/CMakeLists.txt
2020-10-19 22:26:38 UTC (rev 77509)
@@ -43,9 +43,7 @@
endif(NOT DEFINED LIB_DIR)
set(IWIDGETS_PKGNAME Iwidgets)
-set(IWIDGETS_PKGVERSION "4.1.1")
-set(VERSION ${IWIDGETS_PKGVERSION})
-set(IWIDGETS_VERSION ${IWIDGETS_PKGVERSION})
+set(IWIDGETS_VERSION "4.1.1")
set(IWIDGETS_SCRIPTS
generic/buttonbox.itk
@@ -110,17 +108,17 @@
)
# Set up install rules
-install(FILES ${IWIDGETS_SCRIPTS} DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION}/scripts)
+install(FILES ${IWIDGETS_SCRIPTS} DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_VERSION}/scripts)
# Create the pkgIndex.tcl file and configure iwidgets.tcl.
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${IWIDGETS_PKGNAME} ${IWIDGETS_PKGVERSION} [list source [file join $dir
iwidgets.tcl]]")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl "package ifneeded
${IWIDGETS_PKGNAME} ${IWIDGETS_VERSION} [list source [file join $dir
../../${LIB_DIR}/Iwidgets${IWIDGETS_VERSION}/iwidgets.tcl]]")
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl
PROPERTIES GENERATED TRUE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/iwidgets.tcl.in
${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl)
# Add install rules for generated files
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
-install(FILES license.terms DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_PKGVERSION})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_VERSION})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/iwidgets.tcl DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_VERSION})
+install(FILES license.terms DESTINATION
${LIB_DIR}/${IWIDGETS_PKGNAME}${IWIDGETS_VERSION})
# Local Variables:
# tab-width: 8
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
