Moar CMake improvements (#1847)

DanShaders · web-flow · commit b118ab31da8b · 2025-10-27T21:36:17.000+03:00
* Require OpenSSL from top-level CMakeLists * Automatically generate TLO files for TL schemas * Remove useless directory include in tddb target * Do not compile some validator sources 3 times Instead, put them into an object library and use it in 3 different validator targets. * Do not make ninja regenerate smartcont/provider-code.h on every run OUTPUT parameter is relative to the current binary directory by default, so we need to explicitly use ${CMAKE_CURRENT_SOURCE_DIR}. * Run CI in forks as well I faced some unexpected backlash from other developers because of disabling it in #1844.
diff --git a/.github/workflows/build-ton-linux-android-tonlib.yml b/.github/workflows/build-ton-linux-android-tonlib.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
 
     steps:
diff --git a/.github/workflows/build-ton-linux-arm64-appimage.yml b/.github/workflows/build-ton-linux-arm64-appimage.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04-arm
 
     steps:
diff --git a/.github/workflows/build-ton-linux-arm64-shared.yml b/.github/workflows/build-ton-linux-arm64-shared.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/build-ton-linux-x86-64-appimage.yml b/.github/workflows/build-ton-linux-x86-64-appimage.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
 
     steps:
diff --git a/.github/workflows/build-ton-linux-x86-64-shared.yml b/.github/workflows/build-ton-linux-x86-64-shared.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/build-ton-linux-x86-64-werror.yml b/.github/workflows/build-ton-linux-x86-64-werror.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-24.04
 
     steps:
diff --git a/.github/workflows/build-ton-macos-13-x86-64-portable.yml b/.github/workflows/build-ton-macos-13-x86-64-portable.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: macos-13
 
     steps:
diff --git a/.github/workflows/build-ton-macos-14-arm64-portable.yml b/.github/workflows/build-ton-macos-14-arm64-portable.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: macos-14
 
     steps:
diff --git a/.github/workflows/build-ton-macos-15-arm64-shared.yml b/.github/workflows/build-ton-macos-15-arm64-shared.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: macos-15
 
     steps:
diff --git a/.github/workflows/build-ton-macos-arm64-shared.yml b/.github/workflows/build-ton-macos-arm64-shared.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: macos-14
 
     steps:
diff --git a/.github/workflows/build-ton-macos-x86-64-shared.yml b/.github/workflows/build-ton-macos-x86-64-shared.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: macos-13
 
     steps:
diff --git a/.github/workflows/build-ton-wasm-emscripten.yml b/.github/workflows/build-ton-wasm-emscripten.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
 
     steps:
diff --git a/.github/workflows/docker-ubuntu-branch-image.yml b/.github/workflows/docker-ubuntu-branch-image.yml
@@ -12,8 +12,6 @@ env:
 
 jobs:
   build-arm64:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04-arm
     steps:
       - name: Check out repository
@@ -51,8 +49,6 @@ jobs:
 
 
   build-amd64:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
@@ -90,8 +86,6 @@ jobs:
 
 
   merge:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
     needs:
       - build-amd64
diff --git a/.github/workflows/docker-ubuntu-image.yml b/.github/workflows/docker-ubuntu-image.yml
@@ -11,8 +11,6 @@ env:
 
 jobs:
   build-arm64:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04-arm
     steps:
       - name: Check out repository
@@ -55,8 +53,6 @@ jobs:
           tags:  ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.TAG }}-arm64
 
   build-amd64:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
     steps:
       - name: Check out repository
@@ -99,8 +95,6 @@ jobs:
           tags:  ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.TAG }}-amd64
 
   merge:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
     needs:
       - build-amd64
diff --git a/.github/workflows/ton-ccpcheck.yml b/.github/workflows/ton-ccpcheck.yml
@@ -4,8 +4,6 @@ on: [push, pull_request, workflow_dispatch, workflow_call]
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
-
     runs-on: ubuntu-22.04
 
     steps:
diff --git a/.github/workflows/ton-x86-64-windows.yml b/.github/workflows/ton-x86-64-windows.yml
@@ -8,7 +8,6 @@ defaults:
 
 jobs:
   build:
-    if: github.repository == 'ton-blockchain/ton'
 
     runs-on: windows-2022
 
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ parsetab.py
 parsetab.pyc
 tdutils/generate/auto/
 tl/generate/auto/
+tl/generate/scheme/*.tlo
 compile_commands.json
 crypto/block/block-auto.cpp
 crypto/block/block-auto.h
diff --git a/.gitmodules b/.gitmodules
@@ -17,3 +17,6 @@
 	path = third-party/secp256k1
 	url = https://github.com/bitcoin-core/secp256k1
 	branch = v0.3.2
+[submodule "third-party/tl-parser"]
+	path = third-party/tl-parser
+	url = https://github.com/ton-blockchain/tl-parser.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -170,6 +170,9 @@ if (USE_LIBRAPTORQ)
   add_subdirectory(third-party/libraptorq EXCLUDE_FROM_ALL)
 endif()
 
+message("Add tl-parser")
+add_subdirectory(third-party/tl-parser EXCLUDE_FROM_ALL)
+
 message("Add ton")
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
 
@@ -366,6 +369,10 @@ if (NOT LATEX_FOUND)
 endif()
 #END internal
 
+if (NOT OPENSSL_FOUND)
+  find_package(OpenSSL REQUIRED)
+endif()
+
 function(target_link_libraries_system target)
   set(libs ${ARGN})
   foreach(lib ${libs})
diff --git a/catchain/CMakeLists.txt b/catchain/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(CATCHAIN_SOURCE
   catchain-received-block.cpp
   #catchain-receiver-fork.cpp
diff --git a/create-hardfork/CMakeLists.txt b/create-hardfork/CMakeLists.txt
@@ -1,8 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
-
 set(CREATE_HARDFORK_SOURCE
   create-hardfork.cpp
 )
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(TON_CRYPTO_CORE_SOURCE
   Ed25519.cpp
   common/bigint.cpp
diff --git a/dht-server/CMakeLists.txt b/dht-server/CMakeLists.txt
@@ -1,8 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
-
 set (DHT_SERVER_SOURCE
   dht-server.cpp
   dht-server.hpp
diff --git a/dht/CMakeLists.txt b/dht/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(DHT_SOURCE
   dht.cpp
   dht-remote-node.cpp
diff --git a/fec/CMakeLists.txt b/fec/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(FEC_SOURCE
   fec.h
   fec.cpp
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(OVERLAY_SOURCE
   overlay-manager.cpp
   overlay.cpp
diff --git a/rldp/CMakeLists.txt b/rldp/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(RLDP_SOURCE
   rldp.cpp
   rldp-peer.cpp
diff --git a/rldp2/CMakeLists.txt b/rldp2/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 if (NOT GSL_FOUND)
   find_package(GSL)
 endif()
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
@@ -1,8 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
-
 set(STORAGE_SOURCE
   LoadSpeed.cpp
   MerkleTree.cpp
diff --git a/storage/storage-daemon/CMakeLists.txt b/storage/storage-daemon/CMakeLists.txt
@@ -5,7 +5,7 @@ add_custom_command(
   COMMAND embed-provider-code smartcont/storage-provider-code.boc smartcont/provider-code.h
   COMMENT "Generate provider-code.h"
   DEPENDS embed-provider-code smartcont/storage-provider-code.boc
-  OUTPUT smartcont/provider-code.h
+  OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/smartcont/provider-code.h"
 )
 
 set(STORAGE_DAEMON_SOURCE
diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
@@ -58,7 +58,6 @@ if (TDDB_USE_ROCKSDB)
   target_sources(tddb PRIVATE ${TDDB_ROCKSDB_SOURCE})
   target_compile_definitions(tddb PUBLIC -DTDDB_USE_ROCKSDB)
   target_link_libraries(tddb PUBLIC rocksdb)
-  target_include_directories(tddb PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../third-party/rocksdb/include>)
 endif()
 
 add_executable(io-bench test/io-bench.cpp)
diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
@@ -1,5 +1,7 @@
 option(TDUTILS_MIME_TYPE "Generate mime types conversion (gperf is required)" ON)
 
+set(TD_HAVE_OPENSSL 1)
+
 if (WIN32)
   if (WINGETOPT_FOUND)
     set(TD_HAVE_GETOPT 1)
@@ -19,14 +21,6 @@ endif()
 if (ZLIB_FOUND)
   set(TD_HAVE_ZLIB 1)
   message(STATUS "Found ZLIB: ${ZLIB_INCLUDE_DIR} ${ZLIB_LIBRARIES}")
-
-  # OpenSSL internally depends on zlib
-  if (NOT OPENSSL_FOUND)
-    find_package(OpenSSL)
-  endif()
-  if (OPENSSL_FOUND)
-    set(TD_HAVE_OPENSSL 1)
-  endif()
 endif()
 
 if (CRC32C_FOUND)
diff --git a/terminal/CMakeLists.txt b/terminal/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(TERMINAL_SOURCE
   terminal.cpp
 
diff --git a/third-party/tl-parser b/third-party/tl-parser
@@ -0,0 +1 @@
+Subproject commit aba8925886a599b439f0a9a919abdaa363b8cb2e
diff --git a/tl/generate/CMakeLists.txt b/tl/generate/CMakeLists.txt
@@ -60,7 +60,14 @@ add_executable(tonlib_generate_java_api ${TL_GENERATE_JAVA_SOURCE})
 target_link_libraries(tonlib_generate_java_api PRIVATE tdtl)
 
 if (NOT CMAKE_CROSSCOMPILING)
-  find_program(PHP_EXECUTABLE php)
+  foreach(tl_scheme lite_api ton_api tonlib_api)
+    add_custom_command(
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scheme
+      COMMAND $<TARGET_FILE:tl-parser> -e "${tl_scheme}.tlo" "${tl_scheme}.tl"
+      DEPENDS tl-parser "scheme/${tl_scheme}.tl"
+      OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/scheme/${tl_scheme}.tlo"
+    )
+  endforeach()
 
   set(GENERATE_COMMON_CMD generate_common)
   add_executable(generate_common ${TL_GENERATE_COMMON_SOURCE})
diff --git a/tl/generate/scheme/lite_api.tlo b/tl/generate/scheme/lite_api.tlo
diff --git a/tl/generate/scheme/ton_api.tlo b/tl/generate/scheme/ton_api.tlo
diff --git a/tl/generate/scheme/tonlib_api.tlo b/tl/generate/scheme/tonlib_api.tlo
diff --git a/tl/generate/scheme/update-tlo.sh b/tl/generate/scheme/update-tlo.sh
diff --git a/tonlib/CMakeLists.txt b/tonlib/CMakeLists.txt
@@ -1,9 +1,5 @@
 option(TONLIBJSON_STATIC "Build tonlibjson as static library" OFF)
 
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 set(TONLIB_SOURCE
   tonlib/Client.cpp
   tonlib/Config.cpp
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
@@ -1,7 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
 add_executable(generate-random-id generate-random-id.cpp )
 target_link_libraries(generate-random-id tl_api ton_crypto keys adnl git)
 
diff --git a/validator-engine/CMakeLists.txt b/validator-engine/CMakeLists.txt
@@ -1,8 +1,3 @@
-if (NOT OPENSSL_FOUND)
-  find_package(OpenSSL REQUIRED)
-endif()
-
-
 set(VALIDATOR_ENGINE_SOURCE
   validator-engine.hpp
   validator-engine.cpp
diff --git a/validator-session/CMakeLists.txt b/validator-session/CMakeLists.txt
diff --git a/validator/CMakeLists.txt b/validator/CMakeLists.txt
diff --git a/validator/impl/CMakeLists.txt b/validator/impl/CMakeLists.txt
