From 0296c94f8cbaee72be742be5dfda13f174e7f649 Mon Sep 17 00:00:00 2001 From: David Steele Date: Wed, 10 Jan 2018 17:46:40 +0000 Subject: [PATCH] Updates to CMake compile scripts Change-Id: I54dc9ef58bcc34ff6268412485fda675380e0d3c --- .gitignore | 1 + dali/devel-api/CMakeLists.txt | 2 +- dali/internal/CMakeLists.txt | 2 +- dali/public-api/CMakeLists.txt | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cfb5c0e..f79ec09 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ libdali-core.so.0.1.1 /build/tizen/.cov /build/desktop /packaging/home* +compile_commands.json diff --git a/dali/devel-api/CMakeLists.txt b/dali/devel-api/CMakeLists.txt index c39c63a..d0663c3 100644 --- a/dali/devel-api/CMakeLists.txt +++ b/dali/devel-api/CMakeLists.txt @@ -1,3 +1,4 @@ + SET( SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/actors/actor-devel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/actors/custom-actor-devel.cpp @@ -12,7 +13,6 @@ SET( SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/images/nine-patch-image.cpp ${CMAKE_CURRENT_SOURCE_DIR}/images/pixel-data-devel.cpp ${CMAKE_CURRENT_SOURCE_DIR}/object/handle-devel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/object/weak-handle.cpp ${CMAKE_CURRENT_SOURCE_DIR}/object/csharp-type-registry.cpp ${CMAKE_CURRENT_SOURCE_DIR}/scripting/scripting.cpp ${CMAKE_CURRENT_SOURCE_DIR}/signals/signal-delegate.cpp diff --git a/dali/internal/CMakeLists.txt b/dali/internal/CMakeLists.txt index b9ac3eb..2abb3a1 100644 --- a/dali/internal/CMakeLists.txt +++ b/dali/internal/CMakeLists.txt @@ -6,7 +6,7 @@ SET(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/common/internal-constants.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/math.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/message-buffer.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/common/mutex-impl.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/common/mutex-trace.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/image-sampler.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/image-attributes.cpp ${CMAKE_CURRENT_SOURCE_DIR}/common/fixed-size-memory-pool.cpp diff --git a/dali/public-api/CMakeLists.txt b/dali/public-api/CMakeLists.txt index bf57dcd..59b2839 100644 --- a/dali/public-api/CMakeLists.txt +++ b/dali/public-api/CMakeLists.txt @@ -86,6 +86,7 @@ SET(SOURCES ${SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/signals/functor-delegate.cpp ${CMAKE_CURRENT_SOURCE_DIR}/object/type-info.cpp ${CMAKE_CURRENT_SOURCE_DIR}/object/type-registry.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/object/weak-handle.cpp ${CMAKE_CURRENT_SOURCE_DIR}/dali-core-version.cpp PARENT_SCOPE ) -- 2.7.4