From b59d7946d4863b3b939e384ff2c14eacb69530ad Mon Sep 17 00:00:00 2001
From: Vo Trung Chi <chi.votrung@vn.bosch.com>
Date: Tue, 9 Jul 2019 15:37:33 +0700
Subject: cmake: Allow build as a subproject (#145)

Use PROJECT_* instead of CMAKE_* to allow build as a subproject of another
cmake project.

Signed-off-by: Vo Trung Chi <Chi.VoTrung@vn.bosch.com>
---
 src/console/logstorage/CMakeLists.txt |  2 +-
 src/core_dump_handler/CMakeLists.txt  | 12 ++++++------
 src/dbus/CMakeLists.txt               |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/console/logstorage/CMakeLists.txt b/src/console/logstorage/CMakeLists.txt
index 160d905..ca8e017 100644
--- a/src/console/logstorage/CMakeLists.txt
+++ b/src/console/logstorage/CMakeLists.txt
@@ -23,7 +23,7 @@ if(WITH_DLT_LOGSTORAGE_CTRL_UDEV)
 endif(WITH_DLT_LOGSTORAGE_CTRL_UDEV)
 
 if(WITH_SYSTEMD)
- set(dlt_logstorage_ctrl_SRCS ${dlt_logstorage_ctrl_SRCS} ${CMAKE_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c)
+ set(dlt_logstorage_ctrl_SRCS ${dlt_logstorage_ctrl_SRCS} ${PROJECT_SOURCE_DIR}/systemd/3rdparty/sd-daemon.c)
 endif(WITH_SYSTEMD)
 
 add_executable(dlt-logstorage-ctrl ${dlt_logstorage_ctrl_SRCS} ${dlt_control_common_SRCS} ${dlt_most_SRCS})
diff --git a/src/core_dump_handler/CMakeLists.txt b/src/core_dump_handler/CMakeLists.txt
index 4545e93..96b6519 100644
--- a/src/core_dump_handler/CMakeLists.txt
+++ b/src/core_dump_handler/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 if(WITH_DLT_COREDUMPHANDLER)
 
-    set( PLATFORM_DIR ${CMAKE_SOURCE_DIR}/src/core_dump_handler/${TARGET_CPU_NAME} )
+    set(PLATFORM_DIR ${PROJECT_SOURCE_DIR}/src/core_dump_handler/${TARGET_CPU_NAME})
     set(dlt_cdh_SRCS dlt_cdh.c dlt_cdh_context.c dlt_cdh_coredump.c ${PLATFORM_DIR}/dlt_cdh_cpuinfo.c dlt_cdh_crashid.c dlt_cdh_streamer.c)
 
     set(COREDUMP_CONF_DIR "/usr/lib/sysctl.d/")
@@ -25,21 +25,21 @@ if(WITH_DLT_COREDUMPHANDLER)
     #add_definitions( -fno-strict-aliasing )
 
     if(WITH_CITYHASH)
-        set( CITYHASH_DIR ${CMAKE_SOURCE_DIR}/src/core_dump_handler/cityhash_c )
-        add_definitions( -DHAS_CITYHASH_C )
-        set(dlt_cdh_SRCS ${CITYHASH_DIR}/city_c.c ${dlt_cdh_SRCS} )
+        set(CITYHASH_DIR ${PROJECT_SOURCE_DIR}/src/core_dump_handler/cityhash_c)
+        add_definitions(-DHAS_CITYHASH_C)
+        set(dlt_cdh_SRCS ${CITYHASH_DIR}/city_c.c ${dlt_cdh_SRCS})
     endif(WITH_CITYHASH)
 
     add_executable(dlt-cdh ${dlt_cdh_SRCS})
     target_link_libraries(dlt-cdh z)
     set_target_properties(dlt-cdh PROPERTIES LINKER_LANGUAGE C)
 
-    configure_file(${CMAKE_SOURCE_DIR}/src/core_dump_handler/50-coredump.conf.cmake ${PROJECT_BINARY_DIR}/core_dump_handler/50-coredump.conf)
+    configure_file(${PROJECT_SOURCE_DIR}/src/core_dump_handler/50-coredump.conf.cmake ${PROJECT_BINARY_DIR}/core_dump_handler/50-coredump.conf)
 
     install(TARGETS     dlt-cdh
             RUNTIME DESTINATION bin
             COMPONENT base)
 
-    install(FILES ${PROJECT_BINARY_DIR}/core_dump_handler/50-coredump.conf DESTINATION ${COREDUMP_CONF_DIR} )
+    install(FILES ${PROJECT_BINARY_DIR}/core_dump_handler/50-coredump.conf DESTINATION ${COREDUMP_CONF_DIR})
 
 endif(WITH_DLT_COREDUMPHANDLER)
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index b91496e..49b7ea5 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -16,8 +16,8 @@
 #######
 
 include_directories(
-    ${CMAKE_SOURCE_DIR}/
-    ${CMAKE_SOURCE_DIR}/include/dlt
+    ${PROJECT_SOURCE_DIR}/
+    ${PROJECT_SOURCE_DIR}/include/dlt
     ${DBUS_INCLUDE_DIRS}
 )
 
-- 
cgit v1.2.1