OpenSystemsDevelopment / qpdf

Commit 63c5a56f38f51c4e1f0226721eae59a9201fed0e

Authored by Jay Berkenbilt
1 parent 08ba21cf

Fix build logic around generate_auto_job 

It was being run at configuration time, not build time.
Inline Side-by-side
Showing 3 changed files with 23 additions and 3 deletions
generate_auto_job
  View file @63c5a56
... ... @@ -154,6 +154,7 @@ class Main:
154 154 # SOURCES is a list of source files whose contents are used by
155 155 # this program. If they change, we are out of date.
156 156 SOURCES = [
  157 + # Keep this list in sync with libqpdf/CMakeLists.txt: auto_job_inputs
157 158 whoami,
158 159 'manual/_ext/qpdf.py',
159 160 'job.yml',
... ... @@ -164,6 +165,7 @@ class Main:
164 165 # code, are included in various places by QPDFJob.hh or any of the
165 166 # implementing QPDFJob*.cc files.
166 167 DESTS = {
  168 + # Keep this list in sync with libqpdf/CMakeLists.txt: auto_job_outputs
167 169 'decl': 'libqpdf/qpdf/auto_job_decl.hh',
168 170 'init': 'libqpdf/qpdf/auto_job_init.hh',
169 171 'help': 'libqpdf/qpdf/auto_job_help.hh',
... ...
job.sums
  View file @63c5a56
1 1 # Generated by generate_auto_job
2   -generate_auto_job 86109dcb8646dca3f50b6ff92d460c62fcd98a5c95d47276b7c1217f4430271e
  2 +generate_auto_job 4282688446d9f2a432990eb337e4824e889083b529387b64129b84671ec22328
3 3 include/qpdf/auto_job_c_att.hh 4c2b171ea00531db54720bf49a43f8b34481586ae7fb6cbf225099ee42bc5bb4
4 4 include/qpdf/auto_job_c_copy_att.hh 50609012bff14fd82f0649185940d617d05d530cdc522185c7f3920a561ccb42
5 5 include/qpdf/auto_job_c_enc.hh 28446f3c32153a52afa239ea40503e6cc8ac2c026813526a349e0cd4ae17ddd5
... ...
libqpdf/CMakeLists.txt
  View file @63c5a56
  1 +set(auto_job_inputs
  2 + # Keep in sync with SOURCES in generate_auto_job
  3 + ../generate_auto_job
  4 + ../manual/_ext/qpdf.py
  5 + ../job.yml
  6 + ../manual/cli.rst)
  7 +
  8 +set(auto_job_outputs
  9 + # Keep in sync with DESTS in generate_auto_job
  10 + qpdf/auto_job_decl.hh
  11 + qpdf/auto_job_init.hh
  12 + qpdf/auto_job_help.hh
  13 + qpdf/auto_job_schema.hh
  14 + qpdf/auto_job_json_decl.hh
  15 + qpdf/auto_job_json_init.hh)
1 16  
2 17 if(GENERATE_AUTO_JOB)
3   - execute_process(
  18 + add_custom_command(
  19 + OUTPUT ${auto_job_outputs}
4 20 COMMAND ${qpdf_SOURCE_DIR}/generate_auto_job --generate
5   - WORKING_DIRECTORY ${qpdf_SOURCE_DIR})
  21 + WORKING_DIRECTORY ${qpdf_SOURCE_DIR}
  22 + DEPENDS ${auto_job_inputs})
  23 + add_custom_target(auto_job_files ALL DEPENDS ${auto_job_outputs})
6 24 endif()
7 25  
8 26 set(libqpdf_crypto_native
... ...