split long FIND_DEPS|USE_VARS into multiple lines

issue #367
smanders · Jan 3, 2023 · 43b0da9 · 43b0da9
1 parent 7deaef3
commit 43b0da9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/projects/openssl.cmake b/projects/openssl.cmake
@@ -50,7 +50,9 @@ function(build_openssl)
     -DXP_NAMESPACE:STRING=xpro
     ${NASM_EXE}
     )
-  set(FIND_DEPS "set(THREAD_PREFER_PTHREAD_FLAG ON)\nfind_package(Threads REQUIRED) # crypto depends on Threads::Threads\n")
+  set(FIND_DEPS "set(THREAD_PREFER_PTHREAD_FLAG ON)\n")
+  set(FIND_DEPS "${FIND_DEPS}find_package(Threads REQUIRED)")
+  set(FIND_DEPS "${FIND_DEPS} # crypto depends on Threads::Threads\n")
   set(TARGETS_FILE tgt-${NAME}/${NAME}-targets.cmake)
   string(TOUPPER ${NAME} PRJ)
   set(USE_VARS "set(${PRJ}_LIBRARIES xpro::crypto xpro::ssl)\n")

diff --git a/projects/protobuf.cmake b/projects/protobuf.cmake
@@ -39,12 +39,15 @@ function(build_protobuf)
     -Dprotobuf_BUILD_TESTS=OFF # no gmock, unless switch to release tar ball
     )
   set(FIND_DEPS "xpFindPkg(PKGS zlib) # dependencies\n")
-  set(FIND_DEPS "${FIND_DEPS}set(FPHSA_NAME_MISMATCHED TRUE) # FIND_PACKAGE_HANDLE_STANDARD_ARGS NAME_MISMATCHED\n")
-  set(FIND_DEPS "${FIND_DEPS}set(protobuf_MODULE_COMPATIBLE ON) # necessary for GENERATE_PROTOBUF_CPP\n")
+  set(FIND_DEPS "${FIND_DEPS}set(FPHSA_NAME_MISMATCHED TRUE)")
+  set(FIND_DEPS "${FIND_DEPS} # FIND_PACKAGE_HANDLE_STANDARD_ARGS NAME_MISMATCHED\n")
+  set(FIND_DEPS "${FIND_DEPS}set(protobuf_MODULE_COMPATIBLE ON)")
+  set(FIND_DEPS "${FIND_DEPS} # necessary for GENERATE_PROTOBUF_CPP\n")
   set(TARGETS_FILE tgt-${NAME}/${NAME}-config.cmake)
   string(TOUPPER ${NAME} PRJ)
   set(USE_VARS "set(${PRJ}_LIBRARIES xpro::libprotobuf)\n")
-  set(USE_VARS "${USE_VARS}set(${PRJ}_PROTOC_EXECUTABLE xpro::protoc) # TRICKY: match name in -module.cmake\n")
+  set(USE_VARS "${USE_VARS}set(${PRJ}_PROTOC_EXECUTABLE xpro::protoc)")
+  set(USE_VARS "${USE_VARS} # TRICKY: match name in -module.cmake\n")
   set(USE_VARS "${USE_VARS}get_target_property(${PRJ}_INCLUDE_DIR xpro::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)\n")
   set(USE_VARS "${USE_VARS}list(APPEND reqVars ${PRJ}_INCLUDE_DIR ${PRJ}_LIBRARIES ${PRJ}_PROTOC_EXECUTABLE)\n")
   configure_file(${MODULES_DIR}/usexp.cmake.in

diff --git a/projects/sodium.cmake b/projects/sodium.cmake
@@ -37,7 +37,9 @@ function(build_sodium)
     -DXP_INSTALL_CMAKEDIR=share/cmake/tgt-${NAME}
     -DXP_NAMESPACE:STRING=xpro
     )
-  set(FIND_DEPS "set(THREAD_PREFER_PTHREAD_FLAG ON)\nfind_package(Threads REQUIRED) # ${NAME} depends on Threads::Threads\n")
+  set(FIND_DEPS "set(THREAD_PREFER_PTHREAD_FLAG ON)\n")
+  set(FIND_DEPS "${FIND_DEPS}find_package(Threads REQUIRED)")
+  set(FIND_DEPS "${FIND_DEPS} # ${NAME} depends on Threads::Threads\n")
   set(TARGETS_FILE tgt-${NAME}/${NAME}-targets.cmake)
   string(TOUPPER ${NAME} PRJ)
   set(USE_VARS "set(${PRJ}_LIBRARIES xpro::${NAME})\n")