summaryrefslogtreecommitdiffstats
path: root/can-config-generator
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-04-14 09:28:48 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-04-14 09:28:48 +0200
commit39c3509aa25259db4f75805a1d1da3ab78ce6c88 (patch)
tree0c3d8248a680c53fd1f1ff59dfc4d4f251c05164 /can-config-generator
parent181b0eda648dd7e770414fd5980644ce56711f5d (diff)
Update CMake logic making external libs global
Each external libraries is a target that can be linked to a target project. Change-Id: I4564eaa1c96c877c42f2a420599e27279f48d378 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'can-config-generator')
-rw-r--r--can-config-generator/CMakeLists.txt14
1 files changed, 1 insertions, 13 deletions
diff --git a/can-config-generator/CMakeLists.txt b/can-config-generator/CMakeLists.txt
index 5baf632c..0892d2af 100644
--- a/can-config-generator/CMakeLists.txt
+++ b/can-config-generator/CMakeLists.txt
@@ -21,17 +21,6 @@
PROJECT_TARGET_ADD(can-config-generator)
# Define project Targets
- fill_include_dir(${PROJECT_LIBDIR})
- file(GLOB filelist "${PROJECT_LIBDIR}/*")
- foreach(filename ${filelist})
- if(IS_DIRECTORY ${filename})
- include_directories(${filename})
- STRING(REGEX REPLACE "^.*\/(.*)$" "\\1" shortname ${filename})
- find_source_files(${PROJECT_LIBDIR})
- add_library(${shortname} STATIC ${sources_files})
- endif(IS_DIRECTORY ${filename})
- endforeach()
-
add_executable(can-config-generator
src/main.cpp
src/openxc/message_set.cpp
@@ -44,10 +33,9 @@ PROJECT_TARGET_ADD(can-config-generator)
# Library dependencies (include updates automatically)
TARGET_LINK_LIBRARIES(can-config-generator
- ${EXTRA_LINK_LIBRARIES}
${link_libraries}
)
# installation directory
INSTALL(TARGETS can-config-generator
- RUNTIME DESTINATION ${BINDINGS_INSTALL_DIR})
+ RUNTIME DESTINATION ${BINDINGS_INSTALL_DIR}) \ No newline at end of file