Skip to content

Commit 4d79cd4

Browse files
committed
-project struct changed
1 parent f1bf765 commit 4d79cd4

File tree

13 files changed

+7
-7
lines changed

13 files changed

+7
-7
lines changed

.github/workflows/cmake-multi-platform.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
6060
if: runner.os != 'Windows'
6161
run: >
62-
cmake lib -DTARGET_LINUX=ON
62+
cmake -DTARGET_LINUX=ON
6363
-B ${{github.workspace}}/build
6464
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
6565
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
@@ -70,7 +70,7 @@ jobs:
7070
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
7171
if: runner.os == 'Windows'
7272
run: >
73-
cmake lib -DTARGET_WINDOWS=ON
73+
cmake -DTARGET_WINDOWS=ON
7474
-B ${{github.workspace}}/build
7575
-DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
7676
-DCMAKE_C_COMPILER=${{ matrix.c_compiler }}

.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
{
3131
"type": "shell",
3232
"label": "WINDOWS-CFG-LIBRARY",
33-
"command": "cmake lib -DTARGET_WINDOWS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=Release -Bbuild-lib",
33+
"command": "cmake -DTARGET_WINDOWS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=Release -Bbuild-lib",
3434
"options": {
3535
"cwd": "${workspaceFolder}"
3636
},
@@ -39,7 +39,7 @@
3939
{
4040
"type": "shell",
4141
"label": "LINUX-CFG-LIBRARY",
42-
"command": "cmake lib -DTARGET_LINUX=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=Release -Bbuild-lib",
42+
"command": "cmake -DTARGET_LINUX=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_BUILD_TYPE=Release -Bbuild-lib",
4343
"options": {
4444
"cwd": "${workspaceFolder}"
4545
},
File renamed without changes.

examples/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ target_sources(${PROJECT_NAME} PRIVATE
99
read_write.cpp
1010
)
1111

12-
add_subdirectory(../lib serial-port)
13-
get_directory_property(TARGET_PLATFORM DIRECTORY ../lib DEFINITION TARGET_PLATFORM)
12+
add_subdirectory(../ serial-port)
13+
get_directory_property(TARGET_PLATFORM DIRECTORY ../ DEFINITION TARGET_PLATFORM)
1414

1515
target_link_libraries (${PROJECT_NAME} simple-serial-port)
1616
target_compile_definitions(${PROJECT_NAME} PRIVATE ${TARGET_PLATFORM}=1)
1717

1818
#common include path
1919
target_include_directories(${PROJECT_NAME} PRIVATE
20-
../lib/inc
20+
../inc
2121
)
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)