Author: rinrab
Date: Sun Jul 7 17:15:39 2024
New Revision: 1918996
URL: http://svn.apache.org/viewvc?rev=1918996&view=rev
Log:
On the 'cmake' branch: Add SVNXX project to build.
Little note: Tests on this library requires Boost library, so they
are not currently implemented.
* build/generator/gen_cmake.py
(Generator.write): Add SVN_BUILD_SVNXX to enable_condition for libsvnxx
target.
(check_ignore_target, ignore_names): Exclude libsvnxx target from
the list of target names to ignore in build.
* CMakeLists.txt
(SVN_BUILD_SVNXX): Add option.
(): Setup include directories for libsvnxx library.
(): Install libsvnxx includes.
Modified:
subversion/branches/cmake/CMakeLists.txt
subversion/branches/cmake/build/generator/gen_cmake.py
Modified: subversion/branches/cmake/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/CMakeLists.txt?rev=1918996&r1=1918995&r2=1918996&view=diff
==============================================================================
--- subversion/branches/cmake/CMakeLists.txt (original)
+++ subversion/branches/cmake/CMakeLists.txt Sun Jul 7 17:15:39 2024
@@ -274,6 +274,19 @@ endif()
include("build/cmake/targets.cmake")
+option(SVN_BUILD_SVNXX "Enable compilation of the C++ bindings (requires C++)"
OFF)
+
+if (SVN_BUILD_SVNXX)
+ target_include_directories(libsvnxx PUBLIC
+ "${CMAKE_CURRENT_SOURCE_DIR}/subversion/bindings/cxx/include"
+ )
+
+ install(
+ DIRECTORY "subversion/bindings/cxx/include/"
+ DESTINATION "include/subversion-1"
+ )
+endif()
+
message(STATUS "Configuration summary:")
message(STATUS " Version ......................... : ${SVN_VERSION}")
message(STATUS " Build type ...................... : ${CMAKE_BUILD_TYPE}")
Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1918996&r1=1918995&r2=1918996&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Sun Jul 7 17:15:39
2024
@@ -135,7 +135,9 @@ class Generator(gen_base.GeneratorBase):
pass
elif isinstance(target, gen_base.TargetLib):
if target.msvc_static:
- build_type = "STATIC"
+ build_type = " STATIC"
+ if target.name == "libsvnxx":
+ enable_condition.append("SVN_BUILD_SVNXX")
msvc_export = []
if isinstance(target, gen_base.TargetLib):
@@ -250,7 +252,6 @@ class Generator(gen_base.GeneratorBase):
"libsvn_auth_gnome_keyring",
"libsvn_auth_kwallet",
- "libsvnxx",
"svnxx-tests",
"libsvn_fs_base",
