You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by pe...@apache.org on 2017/08/03 10:22:03 UTC
svn commit: r1803981 - in /tcl/rivet/branches/cmake: ChangeLog
cmake/CMakeLists.txt
Author: petasis
Date: Thu Aug 3 10:22:03 2017
New Revision: 1803981
URL: http://svn.apache.org/viewvc?rev=1803981&view=rev
Log:
CMake: added support for all Rivet libraries
Modified:
tcl/rivet/branches/cmake/ChangeLog
tcl/rivet/branches/cmake/cmake/CMakeLists.txt
Modified: tcl/rivet/branches/cmake/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/ChangeLog?rev=1803981&r1=1803980&r2=1803981&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/ChangeLog (original)
+++ tcl/rivet/branches/cmake/ChangeLog Thu Aug 3 10:22:03 2017
@@ -1,6 +1,10 @@
2017-08-03 Georgios Petasis <pe...@apache.org>
* CMake build system: Added missing source files, enabled as default
- the build of shared libraries, added needed link libraries.
+ the build of shared libraries, added needed link libraries. Also
+ extended build system for all Rivet libraries (librivetlib.so,
+ librivetparser.so, librivet_worker_mpm.so, librivet_prefork_mpm.so,
+ librivet_lazy_mpm.so), and checked their linked libraries and missing
+ symbols with their versions when build with autoconf.
2017-08-02 Massimo Manghi <mx...@apache.org>
* Changed references in cmake/CMakeList.txt to build with
Modified: tcl/rivet/branches/cmake/cmake/CMakeLists.txt
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/cmake/cmake/CMakeLists.txt?rev=1803981&r1=1803980&r2=1803981&view=diff
==============================================================================
--- tcl/rivet/branches/cmake/cmake/CMakeLists.txt (original)
+++ tcl/rivet/branches/cmake/cmake/CMakeLists.txt Thu Aug 3 10:22:03 2017
@@ -56,12 +56,35 @@ set(rivetparser_sources
${RIVET_SRC_DIR}/parser/parserPkgInit.c
)
+set(rivetlib_sources
+ ${RIVET_SRC_DIR}/librivet/rivetList.c
+ ${RIVET_SRC_DIR}/librivet/rivetCrypt.c
+ ${RIVET_SRC_DIR}/librivet/rivetWWW.c
+ ${RIVET_SRC_DIR}/librivet/rivetPkgInit.c
+)
+
+set(rivet_worker_mpm_sources
+ ${RIVET_SRC_DIR}/mod_rivet_ng/rivet_worker_mpm.c
+ ${RIVET_SRC_DIR}/mod_rivet_ng/worker_prefork_common.c
+)
+
+set(rivet_prefork_mpm_sources
+ ${RIVET_SRC_DIR}/mod_rivet_ng/rivet_prefork_mpm.c
+ ${RIVET_SRC_DIR}/mod_rivet_ng/worker_prefork_common.c
+)
+
+set(rivet_lazy_mpm_sources
+ ${RIVET_SRC_DIR}/mod_rivet_ng/rivet_lazy_mpm.c
+)
+
set(mod_rivet_sources
+ ${RIVET_SRC_DIR}/mod_rivet_ng/mod_rivet.c
${RIVET_SRC_DIR}/request/apache_multipart_buffer.c
${RIVET_SRC_DIR}/request/apache_request.c
${RIVET_SRC_DIR}/mod_rivet_ng/rivetCore.c
${RIVET_SRC_DIR}/mod_rivet_ng/rivetInspect.c
${RIVET_SRC_DIR}/mod_rivet_ng/rivetChannel.c
+ ${RIVET_SRC_DIR}/parser/rivetParser.c
${RIVET_SRC_DIR}/mod_rivet_ng/TclWebapache.c
${RIVET_SRC_DIR}/mod_rivet_ng/apache_config.c
${RIVET_SRC_DIR}/mod_rivet_ng/mod_rivet_cache.c
@@ -72,15 +95,33 @@ set(mod_rivet_sources
# Add build targets...
# ===========================================================================
-add_library(rivetparser ${rivetparser_sources})
-add_library(mod_rivet ${mod_rivet_sources})
-add_library(rivet::parser ALIAS rivetparser)
-add_library(rivet::rivet ALIAS mod_rivet)
+add_library(mod_rivet ${mod_rivet_sources})
+add_library(rivetparser ${rivetparser_sources})
+add_library(rivetlib ${rivetlib_sources})
+add_library(rivet_worker_mpm ${rivet_worker_mpm_sources})
+add_library(rivet_prefork_mpm ${rivet_prefork_mpm_sources})
+add_library(rivet_lazy_mpm ${rivet_lazy_mpm_sources})
+add_library(rivet::parser ALIAS rivetparser)
+add_library(rivet::lib ALIAS rivetparser)
+add_library(rivet::rivet ALIAS mod_rivet)
+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)
# Definitions...
# ===========================================================================
-target_compile_definitions (rivetparser PRIVATE TCL_THREADS=1 HAVE_CONFIG_H=1 )
-target_compile_definitions (mod_rivet PRIVATE TCL_THREADS=1 HAVE_CONFIG_H=1 )
+target_compile_definitions (rivetparser PRIVATE
+ TCL_THREADS=1 HAVE_CONFIG_H=1 USE_TCL_STUBS=1 )
+target_compile_definitions (rivetlib PRIVATE
+ TCL_THREADS=1 HAVE_CONFIG_H=1 USE_TCL_STUBS=1 )
+target_compile_definitions (rivet_worker_mpm PRIVATE
+ TCL_THREADS=1 HAVE_CONFIG_H=1 )
+target_compile_definitions (rivet_prefork_mpm PRIVATE
+ TCL_THREADS=1 HAVE_CONFIG_H=1 )
+target_compile_definitions (rivet_lazy_mpm PRIVATE
+ TCL_THREADS=1 HAVE_CONFIG_H=1 )
+target_compile_definitions (mod_rivet PRIVATE
+ TCL_THREADS=1 HAVE_CONFIG_H=1 )
set(RIVETLIB_DESTDIR "/usr/lib64/rivet3.0/site-packages/mod_rivet")
# ===========================================================================
@@ -106,9 +147,11 @@ if (NOT "${with-tcl}" STREQUAL "")
PATHS ${with-tcl} )
endif ()
FIND_PACKAGE ( TCL 8.6 REQUIRED )
+FIND_PACKAGE ( TclStub REQUIRED )
MESSAGE ( STATUS " TCL_TCLSH: " ${TCL_TCLSH} )
MESSAGE ( STATUS " TCL_INCLUDE_PATH: " ${TCL_INCLUDE_PATH} )
MESSAGE ( STATUS " TCL_LIBRARY: " ${TCL_LIBRARY} )
+MESSAGE ( STATUS " TCL_STUB_LIBRARY: " ${TCL_STUB_LIBRARY} )
# Locate Apache...
# ===========================================================================
@@ -143,15 +186,25 @@ set(RIVET_INCLUDE_DIRS_PRIVATE
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}"
"${PROJECT_BINARY_DIR}"
)
-target_include_directories(rivetparser PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
-target_include_directories(mod_rivet PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
+
+target_include_directories(rivetparser
+ PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
+target_include_directories(rivetlib
+ PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
+target_include_directories(rivet_worker_mpm
+ PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
+target_include_directories(rivet_prefork_mpm
+ PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
+target_include_directories(rivet_lazy_mpm
+ PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
+target_include_directories(mod_rivet
+ PUBLIC ${RIVET_INCLUDE_DIRS_PUBLIC} PRIVATE ${RIVET_INCLUDE_DIRS_PRIVATE})
# Set up libraries...
# ===========================================================================
-target_link_libraries(rivetparser ${TCL_LIBRARY}
- ${APR_LIBRARY} ${APRUTIL_LIBRARY} )
-target_link_libraries(mod_rivet ${TCL_LIBRARY}
- ${APR_LIBRARY} ${APRUTIL_LIBRARY})
+target_link_libraries(rivetparser ${TCL_STUB_LIBRARY})
+target_link_libraries(rivetlib ${TCL_STUB_LIBRARY})
+target_link_libraries(mod_rivet ${TCL_LIBRARY})
set(CONFIGURE_CMD "cmake -${CMAKE_ARGC} ${CMAKE_ARGV0}")
if(version-display)
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org