Code Review
/
apps
/
low-level-can-service.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #236 from wak-google/fix-lib
[apps/low-level-can-service.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
7889bf4
..
bb236a9
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-22,7
+22,7
@@
if(MSVC AND nanopb_MSVC_STATIC_RUNTIME)
endforeach(flag_var)
endif()
endforeach(flag_var)
endif()
-add_library(
lib
protobuf-nanopb STATIC
+add_library(protobuf-nanopb STATIC
pb.h
pb_common.h
pb_common.c
pb.h
pb_common.h
pb_common.c
@@
-31,7
+31,7
@@
add_library(libprotobuf-nanopb STATIC
pb_decode.h
pb_decode.c)
pb_decode.h
pb_decode.c)
-target_include_directories(
lib
protobuf-nanopb INTERFACE
+target_include_directories(protobuf-nanopb INTERFACE
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
@@
-41,7
+41,7
@@
if(NOT DEFINED CMAKE_INSTALL_CMAKEDIR)
set(CMAKE_INSTALL_CMAKEDIR "lib/cmake/nanopb")
endif()
set(CMAKE_INSTALL_CMAKEDIR "lib/cmake/nanopb")
endif()
-install(TARGETS
lib
protobuf-nanopb EXPORT nanopb-targets
+install(TARGETS protobuf-nanopb EXPORT nanopb-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(EXPORT nanopb-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(EXPORT nanopb-targets