Revision: 77926
http://sourceforge.net/p/brlcad/code/77926
Author: starseeker
Date: 2020-12-04 15:23:05 +0000 (Fri, 04 Dec 2020)
Log Message:
-----------
Bring in the other CMake logic updates for tclscript index files.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/CMakeLists.txt
brlcad/trunk/misc/CMake/TCL_PKGINDEX.cmake
Added Paths:
-----------
brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake
Modified: brlcad/trunk/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/trunk/misc/CMake/CMakeLists.txt 2020-12-04 14:59:15 UTC (rev
77925)
+++ brlcad/trunk/misc/CMake/CMakeLists.txt 2020-12-04 15:23:05 UTC (rev
77926)
@@ -105,6 +105,7 @@
tcltest.tcl.in
scripts/timestamp.cmake
scripts/printtime.cmake
+ scripts/tcl_mkindex.cmake
)
CMAKEFILES(${cmake_ignore_files})
Modified: brlcad/trunk/misc/CMake/TCL_PKGINDEX.cmake
===================================================================
--- brlcad/trunk/misc/CMake/TCL_PKGINDEX.cmake 2020-12-04 14:59:15 UTC (rev
77925)
+++ brlcad/trunk/misc/CMake/TCL_PKGINDEX.cmake 2020-12-04 15:23:05 UTC (rev
77926)
@@ -37,39 +37,24 @@
#============================================================
function(TCL_PKGINDEX target pkgname pkgversion)
- # Identify the shared library suffix to be used
- set(lname
${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
-
- # Create a "working" pkgIndex.tcl file that will allow
- # the package to work from the build directory
- set(lld_install "${LIB_DIR}")
+ set(INST_DIR "${LIB_DIR}")
if(MSVC)
- set(lld_install "${BIN_DIR}")
+ set(INST_DIR "${BIN_DIR}")
endif(MSVC)
- if(NOT CMAKE_CONFIGURATION_TYPES)
- set(lld_build "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
- set(bpkgindex
"${CMAKE_BINARY_DIR}/lib/${pkgname}${pkgversion}/pkgIndex.tcl")
- file(WRITE "${bpkgindex}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir \"${lld_build}\" ${lname}] ${pkgname}]")
- DISTCLEAN("${CMAKE_BINARY_DIR}/lib/${pkgname}${pkgversion}")
- else(NOT CMAKE_CONFIGURATION_TYPES)
- foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- set(bpkgindex
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}/${pkgname}${pkgversion}/pkgIndex.tcl")
- set(lld_build "${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
- if(MSVC)
- set(lld_build "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
- endif(MSVC)
- file(WRITE "${bpkgindex}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir \"${lld_build}\" ${lname}] ${pkgname}]")
-
DISTCLEAN(${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}/${pkgname}${pkgversion})
- endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- endif(NOT CMAKE_CONFIGURATION_TYPES)
- # Create the file Tcl will use once installed
- set(ipkgindex "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl")
- file(WRITE "${ipkgindex}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir .. .. \"${lld_install}\" ${lname}] ${pkgname}]")
- install(FILES "${ipkgindex}" DESTINATION lib/${pkgname}${pkgversion})
- DISTCLEAN("${ipkgindex}")
+ set(WORKING_PKGFILE
${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${LIB_DIR}/${pkgname}${pkgversion}/pkgIndex.tcl)
+ set(INSTALL_PKGFILE ${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl)
+ add_custom_command(OUTPUT ${WORKING_PKGFILE} ${INSTALL_PKGFILE}
+ COMMAND ${CMAKE_COMMAND} -DWORKING_PKGFILE="${WORKING_PKGFILE}"
-DINSTALL_PKGFILE="${INSTALL_PKGFILE}"
-DTF_NAME="$<TARGET_FILE_NAME:${target}>"
-DTF_DIR="$<TARGET_FILE_DIR:${target}>" -Dpkgname="${pkgname}"
-Dpkgversion="${pkgversion}" -DINST_DIR="${INST_DIR}" -P
${BRLCAD_CMAKE_DIR}/scripts/tcl_mkindex.cmake
+ )
+ add_custom_target(${pkgname}_pkgIndex ALL DEPENDS ${WORKING_PKGFILE}
${INSTALL_PKGFILE})
+
+ install(FILES ${INSTALL_PKGFILE} DESTINATION
${LIB_DIR}/${pkgname}${pkgversion})
+
+ DISTCLEAN("${WORKING_PKGFILE}")
+ DISTCLEAN("${INSTALL_PKGFILE}")
+
endfunction(TCL_PKGINDEX)
# Local Variables:
Added: brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake
===================================================================
--- brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake
(rev 0)
+++ brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake 2020-12-04 15:23:05 UTC
(rev 77926)
@@ -0,0 +1,44 @@
+#=============================================================================
+#
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# * The names of the authors may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+get_filename_component(TFD "${TF_DIR}" REALPATH)
+file(WRITE "${WORKING_PKGFILE}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir \"${TFD}\" ${TF_NAME}] ${pkgname}]")
+file(WRITE "${INSTALL_PKGFILE}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir .. .. \"${INST_DIR}\" ${TF_NAME}] ${pkgname}]")
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/trunk/misc/CMake/scripts/tcl_mkindex.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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
