Skip to content

Commit

Permalink
Fix error in building the IO Ref
Browse files Browse the repository at this point in the history
This was a regression after changing CMAKE_SOURCE_DIR to
PROJECT_SOURE_DIR
  • Loading branch information
kbenne committed Feb 17, 2020
1 parent 75f6344 commit 83494bf
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions doc/input-output-reference/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# to get the list of input files, go to the root of the document folder, and:
# grep -r '\\input{' * | cut -d ':' -f 2 | cut -c 8- | rev | cut -c 2- | rev | sed 's|^| ${PROJECT_SOURCE_DIR}/doc/input-output-reference/|g' | sed 's/$/.tex/g'
SET( INCLUDED_TEX
${PROJECT_SOURCE_DIR}/doc/input-output-reference/media/ACBussDiagram.png
${PROJECT_SOURCE_DIR}/doc/input-output-reference/media/ACStorageBussDiagram.png
${PROJECT_SOURCE_DIR}/doc/input-output-reference/media/AirLoopComponentMatrix.png
Expand Down Expand Up @@ -198,15 +199,17 @@
SET( SOURCE_FILENAME "input-output-reference" )
SET( OUTPUT_FILENAME "InputOutputReference" )

message("output: ${PROJECT_BINARY_DIR}/doc/${OUTPUT_FILENAME}.pdf")

add_custom_command(
OUTPUT ${PROJECT_BINARY_DIR}/doc/${OUTPUT_FILENAME}.pdf
COMMAND ${CMAKE_COMMAND} -DXELATEX=${XELATEX} -DINNAME=${SOURCE_FILENAME} -DOUTNAME=${OUTPUT_FILENAME} -DORIGINAL_PROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DORIGINAL_PROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DTEX_INTERACTION=${TEX_INTERACTION} -P ${PROJECT_SOURCE_DIR}/cmake/BuildDocumentation.cmake
COMMAND ${CMAKE_COMMAND} -DXELATEX=${XELATEX} -DINNAME=${SOURCE_FILENAME} -DOUTNAME=${OUTPUT_FILENAME} -DORIGINAL_CMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DORIGINAL_CMAKE_BINARY_DIR=${PROJECT_BINARY_DIR} -DTEX_INTERACTION=${TEX_INTERACTION} -P ${CMAKE_SOURCE_DIR}/cmake/BuildDocumentation.cmake
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/doc/${SOURCE_FILENAME}
DEPENDS ${INCLUDED_TEX} ${INCLUDED_IMAGES}
)

add_custom_target( zPDF_${OUTPUT_FILENAME}
DEPENDS ${PROJECT_BINARY_DIR}/doc/${OUTPUT_FILENAME}.pdf
DEPENDS ${PROJECT_BINARY_DIR}/doc/${OUTPUT_FILENAME}.pdf
)

# Make top-level 'documentation' target depend on this one
Expand Down

5 comments on commit 83494bf

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7613-cmake-sub-project (kbenne) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2681 of 2682 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 679
  • Failed: 1

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7613-cmake-sub-project (kbenne) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7613-cmake-sub-project (kbenne) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7613-cmake-sub-project (kbenne) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1290 of 1290 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

7613-cmake-sub-project (kbenne) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (678 of 680 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 678
  • Failed: 1
  • Timeout: 1

Build Badge Test Badge Coverage Badge

Please sign in to comment.