diff options
| author | Petteri Aimonen <jpa@git.mail.kapsi.fi> | 2023-10-26 12:26:15 +0300 |
|---|---|---|
| committer | Petteri Aimonen <jpa@github.mail.kapsi.fi> | 2023-10-27 13:37:50 +0300 |
| commit | 6bbb70af1a7dc47e737957e1ad469581dcbf99f6 (patch) | |
| tree | 2dd2b40297ea4c0b0f736669215226b03e9c4933 /.github/workflows/cmake.yml | |
| parent | f5593b78ba0984c8a4d8382f93b17ee7dd490ba8 (diff) | |
CMake: Installation improvements.
- Allow installed nanopb_generator.py wrapper script find the module by relative path.
- Install include files under `nanopb` subdirectory.
Diffstat (limited to '.github/workflows/cmake.yml')
| -rw-r--r-- | .github/workflows/cmake.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index ac0e641..f8f3838 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -35,7 +35,7 @@ jobs: run: | cd examples/simple nanopb_generator simple.proto - gcc -Wall -Werror -osimple simple.pb.c simple.c -lprotobuf-nanopb + gcc -Wall -Werror -osimple simple.pb.c simple.c -lprotobuf-nanopb -I/usr/local/include/nanopb ./simple build_cmake_windows: @@ -65,7 +65,7 @@ jobs: run: | call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" cd examples/simple - C:\nanopb-test\bin\nanopb_generator simple.proto - cl /out:simple.exe simple.pb.c simple.c C:\nanopb-test\nanopb\lib\protobuf-nanopb.lib + call C:\nanopb-test\bin\nanopb_generator simple.proto + cl simple.pb.c simple.c /IC:\nanopb-test\include\nanopb C:\nanopb-test\lib\protobuf-nanopb.lib /link /out:simple.exe simple.exe |