You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by pe...@apache.org on 2018/12/19 13:40:08 UTC
[tcl-rivet] branch master updated: CMake: generate pkg_Index.tcl
This is an automated email from the ASF dual-hosted git repository.
petasis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/master by this push:
new c496f8e CMake: generate pkg_Index.tcl
c496f8e is described below
commit c496f8ed50a4592c3f3040bcf13f4daafe81e2d7
Author: petasis <pe...@yahoo.gr>
AuthorDate: Wed Dec 19 15:39:48 2018 +0200
CMake: generate pkg_Index.tcl
---
cmake/CMakeLists.txt | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 8c38ff8..0f4af27 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -135,12 +135,15 @@ add_library(rivet::worker_mpm ALIAS rivet_worker_mpm)
add_library(rivet::prefork_mpm ALIAS rivet_prefork_mpm)
add_library(rivet::lazy_mpm ALIAS rivet_lazy_mpm)
-SET_TARGET_PROPERTIES(mod_rivet PROPERTIES PREFIX "" SUFFIX ".so")
-SET_TARGET_PROPERTIES(rivet_worker_mpm PROPERTIES PREFIX "" SUFFIX ".so")
-SET_TARGET_PROPERTIES(rivet_prefork_mpm PROPERTIES PREFIX "" SUFFIX ".so")
-SET_TARGET_PROPERTIES(rivet_lazy_mpm PROPERTIES PREFIX "" SUFFIX ".so")
-SET_TARGET_PROPERTIES(rivetparser PROPERTIES PREFIX "lib")
-SET_TARGET_PROPERTIES(rivetlib PROPERTIES PREFIX "lib")
+SET ( RIVET_LIB_SUFFIX ".so" )
+SET ( RIVET_LIB_PREFIX "lib" )
+
+SET_TARGET_PROPERTIES(mod_rivet PROPERTIES PREFIX "" SUFFIX ${RIVET_LIB_SUFFIX})
+SET_TARGET_PROPERTIES(rivet_worker_mpm PROPERTIES PREFIX "" SUFFIX ${RIVET_LIB_SUFFIX})
+SET_TARGET_PROPERTIES(rivet_prefork_mpm PROPERTIES PREFIX "" SUFFIX ${RIVET_LIB_SUFFIX})
+SET_TARGET_PROPERTIES(rivet_lazy_mpm PROPERTIES PREFIX "" SUFFIX ${RIVET_LIB_SUFFIX})
+SET_TARGET_PROPERTIES(rivetparser PROPERTIES PREFIX ${RIVET_LIB_PREFIX})
+SET_TARGET_PROPERTIES(rivetlib PROPERTIES PREFIX ${RIVET_LIB_PREFIX})
# Definitions...
# ===========================================================================
@@ -485,13 +488,11 @@ install(DIRECTORY
# Regenerate pkgIndex.tcl in all libraries...
# ===========================================================================
-SET ( RIVET_LIBS_ARCH ${RIVETLIB_DESTDIR}/mpm )
+SET ( RIVET_LIBS_ARCH ${RIVETLIB_DESTDIR} )
file(WRITE ${RIVETLIB_DESTDIR}/regenerate_pkgIndex.tcl
"puts \"Regenerating pkgIndex.tcl in [pwd]:\"
file delete {*}[glob [file join packages * pkgIndex.tcl]] pkgIndex.tcl
-pkg_mkIndex -verbose [pwd] init.tcl \\
- {*}[glob [file join packages * *.tcl] \\
- [file join ${RIVET_LIBS_ARCH} *[info sharedlibextension]]]"
+pkg_mkIndex -verbose [pwd] init.tcl packages/*/*.tcl *[info sharedlibextension]"
)
install(CODE "
execute_process(COMMAND ${TCL_TCLSH} regenerate_pkgIndex.tcl
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org