diff options
| author | 박종현/동작제어Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com> | 2018-07-02 10:24:00 +0900 |
|---|---|---|
| committer | GitHub Enterprise <noreply-CODE@samsung.com> | 2018-07-02 10:24:00 +0900 |
| commit | 80a950924d9a89197b20ca81fb7d51199664c8d4 (patch) | |
| tree | 7b42ca3cb87ce484a4b899c57a0928cc4a8163aa /scripts | |
| parent | 90b3b3349bee751c4b1a9141b6fa2ac5395391d0 (diff) | |
| download | nnfw-80a950924d9a89197b20ca81fb7d51199664c8d4.tar.gz nnfw-80a950924d9a89197b20ca81fb7d51199664c8d4.tar.bz2 nnfw-80a950924d9a89197b20ca81fb7d51199664c8d4.zip | |
Use 'cmake --build' instead of make (#414)
This commit revises 'build' command scripts to use 'cmake --build'
instead of make.
This change will allow users to use other build system such as ninja.
Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/command/build | 3 | ||||
| -rw-r--r-- | scripts/command/test | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scripts/command/build b/scripts/command/build index 0198dc8c3..652212f74 100644 --- a/scripts/command/build +++ b/scripts/command/build @@ -8,5 +8,4 @@ if [[ ! -d "${BUILD_WORKSPACE_PATH}" ]]; then echo "'${BUILD_WORKSPACE_RPATH}' does not exist. Please run 'configure' first" exit 255 fi -cd "${BUILD_WORKSPACE_PATH}" -make $@ +cd "${BUILD_WORKSPACE_PATH}" && cmake --build . -- "$@" diff --git a/scripts/command/test b/scripts/command/test index cca0e6d0a..0c7c57069 100644 --- a/scripts/command/test +++ b/scripts/command/test @@ -9,6 +9,5 @@ if [[ ! -d "${BUILD_WORKSPACE_PATH}" ]]; then exit 255 fi -cd "${BUILD_WORKSPACE_PATH}" export CTEST_OUTPUT_ON_FAILURE=1 -make test +cd "${BUILD_WORKSPACE_PATH}" && cmake --build . --target test |