diff options
| -rw-r--r-- | infrastructure/cmake/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | modules.txt | 2 |
2 files changed, 34 insertions, 10 deletions
diff --git a/infrastructure/cmake/CMakeLists.txt b/infrastructure/cmake/CMakeLists.txt index 54164cfa..d00d90b0 100644 --- a/infrastructure/cmake/CMakeLists.txt +++ b/infrastructure/cmake/CMakeLists.txt @@ -61,8 +61,9 @@ if(NOT status EQUAL 0) "status ${status}: ${command_output}") endif() -# Parsing Makefile.extra files in CMake script is a pain, so the relevant rules are -# hard-coded here. +# Parsing Makefile.extra files in CMake script is a pain, so the relevant rules for +# code-generating Perl scripts are hard-coded here. + set(exception_files lib/backupclient/ClientException.txt lib/backupstore/BackupStoreException.txt @@ -113,12 +114,25 @@ foreach(protocol_file ${protocol_files}) set(${module_name}_extra_files ${${module_name}_extra_files} ${output_file}) endforeach() -set(output_file "${base_dir}/${CMAKE_MATCH_1}/autogen_${CMAKE_MATCH_2}.cpp") -add_custom_command(OUTPUT "${output_file}" - MAIN_DEPENDENCY "${base_dir}/bin/bbackupquery/documentation.txt" - COMMAND ${PERL_EXECUTABLE} "${base_dir}/bin/bbackupquery/makedocumentation.pl" - WORKING_DIRECTORY "${base_dir}/bin/bbackupquery") -set(bin_bbackupquery_extra_files ${bin_bbackupquery_extra_files} ${output_file}) +set(documentation_files + bin/bbackupquery/documentation.txt +) + +foreach(documentation_file ${documentation_files}) + string(REGEX MATCH "(.*)/(.*).txt" valid_documentation_file ${documentation_file}) + if(NOT valid_documentation_file) + message(FATAL_ERROR "invalid documentation file: '${documentation_file}'") + endif() + + set(output_file "${base_dir}/${CMAKE_MATCH_1}/autogen_${CMAKE_MATCH_2}.cpp") + add_custom_command(OUTPUT "${output_file}" + MAIN_DEPENDENCY "${base_dir}/${documentation_file}" + COMMAND ${PERL_EXECUTABLE} "${base_dir}/bin/bbackupquery/makedocumentation.pl" + WORKING_DIRECTORY "${base_dir}/${CMAKE_MATCH_1}") + + string(REPLACE "/" "_" module_name ${CMAKE_MATCH_1}) + set(${module_name}_extra_files ${${module_name}_extra_files} ${output_file}) +endforeach() file(STRINGS ${base_dir}/modules.txt module_deps REGEX "^[^#]") # qdbm, lib/common and lib/win32 aren't listed in modules.txt, so hard-code them. @@ -178,7 +192,7 @@ foreach(module_dep target_compile_definitions(${module_name} PRIVATE -DBOX_MODULE="${module_dir}") - if(dependencies MATCHES ".") + if(dependencies) string(REGEX REPLACE "[ ]+" ";" dependency_list "${dependencies}") foreach(dependency ${dependency_list}) @@ -190,6 +204,16 @@ foreach(module_dep # message(STATUS "add link library to '${module_name}': '${dependency}'") target_link_libraries(${module_name} PUBLIC ${dependency}) endif() + + # We can't make a binary depend on another binary, so we need to + # add the dependency's directory directly to our include path. + if(dependency MATCHES "^bin_") + get_property(dep_include_dirs + TARGET ${dependency} + PROPERTY INTERFACE_INCLUDE_DIRECTORIES) + target_include_directories(${module_name} + PUBLIC ${dep_include_dirs}) + endif() endforeach() endif() diff --git a/modules.txt b/modules.txt index aed59ef1..25a9a979 100644 --- a/modules.txt +++ b/modules.txt @@ -40,12 +40,12 @@ test/backupstorefix bin/bbstored bin/bbstoreaccounts lib/backupclient bin/bbacku test/backupstorepatch bin/bbstored bin/bbstoreaccounts lib/backupclient test/backupdiff lib/backupclient test/bbackupd bin/bbackupd bin/bbstored bin/bbstoreaccounts bin/bbackupquery bin/bbackupctl lib/server lib/backupstore lib/backupclient lib/intercept +bin/s3simulator lib/httpserver test/s3store lib/backupclient lib/httpserver bin/s3simulator bin/bbstoreaccounts # HTTP server system lib/httpserver lib/server test/httpserver lib/httpserver -bin/s3simulator lib/httpserver # END_IF_DISTRIBUTION |