Author: rinrab
Date: Sat Jun 29 15:08:19 2024
New Revision: 1918747
URL: http://svn.apache.org/viewvc?rev=1918747&view=rev
Log:
On the 'cmake' branch: Factor-out CMake options into a file.
Argumentations:
1. It is much simpler to edit *.cmake files rather then *.ezt file.
2. In my opinion, the CMakeLists.txt file should contain only a list of targets.
3. There is already `dependencies.cmake` file.
* build/cmake/options.cmake:
New file, with a code from CMakeLists.txt.ezt.
* build/generator/templates/CMakeLists.txt.ezt
(): Cut moved to options.cmake code and include this file.
Added:
subversion/branches/cmake/build/cmake/options.cmake
Modified:
subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt
Added: subversion/branches/cmake/build/cmake/options.cmake
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/cmake/options.cmake?rev=1918747&view=auto
==============================================================================
--- subversion/branches/cmake/build/cmake/options.cmake (added)
+++ subversion/branches/cmake/build/cmake/options.cmake Sat Jun 29 15:08:19 2024
@@ -0,0 +1,25 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+# options.cmake -- options and confiurations for CMake
+#
+
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/subversion/svn_private_config.hc"
+ "${CMAKE_CURRENT_BINARY_DIR}/svn_private_config.h"
+)
Modified: subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt?rev=1918747&r1=1918746&r2=1918747&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt
(original)
+++ subversion/branches/cmake/build/generator/templates/CMakeLists.txt.ezt Sat
Jun 29 15:08:19 2024
@@ -26,10 +26,7 @@ project("Subversion")
include("build/cmake/dependencies.cmake")
-configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/subversion/svn_private_config.hc"
- "${CMAKE_CURRENT_BINARY_DIR}/svn_private_config.h"
-)
+include("build/cmake/options.cmake")
set(SVN_INCLUDE_DIRECTORIES
"${CMAKE_CURRENT_SOURCE_DIR}/subversion/include"