Skip to content

Commit 0e78362

Browse files
authored
Merge pull request #7652 from jparsert/develop
Fix in readme and CMake build system
2 parents 1d0ee45 + f1660cc commit 0e78362

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ message(STATUS "Building CBMC version ${CBMC_VERSION}")
4646

4747
project(CBMC VERSION ${CBMC_VERSION})
4848

49+
set(CBMC_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
50+
4951
# when config.inc changes we’ll need to reconfigure to check if the version changed
5052
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/config.inc")
5153

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Contributing to the code base
107107
6. Create a Pull Request targeting the `develop` branch
108108

109109
New contributors can look through the [mini
110-
projects](https://github.com/diffblue/cbmc/blob/develop/MINI-PROJECTS.md)
110+
projects](https://github.com/diffblue/cbmc/blob/develop/FEATURE_IDEAS.md)
111111
page for small, focussed feature ideas.
112112

113113
License

src/cbmc/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ endif()
5858

5959
# bash completion
6060
if(NOT WIN32)
61-
add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/scripts/bash-autocomplete/cbmc.sh"
62-
COMMAND "${CMAKE_SOURCE_DIR}/scripts/bash-autocomplete/extract_switches.sh"
61+
add_custom_command(OUTPUT "${CBMC_ROOT_DIR}/scripts/bash-autocomplete/cbmc.sh"
62+
COMMAND "${CBMC_ROOT_DIR}/scripts/bash-autocomplete/extract_switches.sh"
6363
DEPENDS $<TARGET_FILE:cbmc>
6464
)
6565
add_custom_target(cbmc.sh ALL
66-
DEPENDS "${CMAKE_SOURCE_DIR}/scripts/bash-autocomplete/cbmc.sh"
66+
DEPENDS "${CBMC_ROOT_DIR}/scripts/bash-autocomplete/cbmc.sh"
6767
)
6868
install(
69-
FILES ${CMAKE_SOURCE_DIR}/scripts/bash-autocomplete/cbmc.sh
69+
FILES ${CBMC_ROOT_DIR}/scripts/bash-autocomplete/cbmc.sh
7070
DESTINATION etc/bash_completion.d
7171
RENAME cbmc
7272
)

0 commit comments

Comments
 (0)