Skip to content

Commit 6975852

Browse files
committed
Changes for CMSDK v2.0
1 parent 53347a4 commit 6975852

4 files changed

Lines changed: 5 additions & 14 deletions

File tree

.github/workflows/cmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ jobs:
3232
working-directory: ${{runner.workspace}}/API/cmake_link
3333
run: cmake ..
3434
env:
35-
CMSDK_PATH: ${{runner.workspace}}/API/CMakeSDK
35+
CMSDK_LOCAL_PATH: ${{runner.workspace}}/API/CMakeSDK
3636

3737
- name: Build
3838
working-directory: ${{runner.workspace}}/API/cmake_link
3939
shell: bash
4040
run: make -j12
4141
env:
42-
CMSDK_PATH: ${{runner.workspace}}/API/CMakeSDK
42+
CMSDK_LOCAL_PATH: ${{runner.workspace}}/API/CMakeSDK
4343

4444
- name: Test
4545
working-directory: ${{runner.workspace}}/API/cmake_link
4646
shell: bash
4747
run: make test
4848
env:
49-
CMSDK_PATH: ${{runner.workspace}}/API/CMakeSDK
49+
CMSDK_LOCAL_PATH: ${{runner.workspace}}/API/CMakeSDK
5050
CTEST_OUTPUT_ON_FAILURE: 1

libraries/API.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ function(api_add_api_library_option NAME DEPENDENCIES LIB_OPTION)
8787
PATTERN CMakelists.txt EXCLUDE)
8888

8989
install(FILES ${LOCAL_NAME}.cmake
90-
DESTINATION ${CMSDK_PATH}/cmake/targets)
90+
DESTINATION ${CMSDK_LOCAL_PATH}/cmake/targets)
9191

9292

9393

libraries/API/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ target_sources(${RELEASE_TARGET}
1111

1212
install(FILES
1313
../API.cmake
14-
DESTINATION ${CMSDK_PATH}/cmake/targets)
14+
DESTINATION ${CMSDK_LOCAL_PATH}/cmake/targets)

libraries/API/api.cmake

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,5 @@ macro(api_target NAME DIRECTORIES)
110110
endforeach()
111111
endif()
112112
endif()
113-
114-
add_custom_target(
115-
${NAME}_format
116-
COMMAND /usr/local/bin/clang-format
117-
-i
118-
--verbose
119-
${FORMAT_LIST}
120-
)
121-
122113
endmacro()
123114

0 commit comments

Comments
 (0)