From 394de90cbc1480cd26c144066cf2a9e0bd9d90ea Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <s89.jang@samsung.com>
Date: Fri, 2 Dec 2016 17:42:37 +0900
Subject: [PATCH] Fix CMakeLists.txt

To make extendible for adding source & header files.

Change-Id: I54198360f67882b6c644d13f027f155855e57d12
Signed-off-by: Sangyoon Jang <s89.jang@samsung.com>
---
 src/hybrid/CMakeLists.txt | 14 +++++++-------
 src/wgt/CMakeLists.txt    | 41 +++++++++++++----------------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/src/hybrid/CMakeLists.txt b/src/hybrid/CMakeLists.txt
index ccc7f4a..e65d713 100644
--- a/src/hybrid/CMakeLists.txt
+++ b/src/hybrid/CMakeLists.txt
@@ -1,10 +1,10 @@
-SET(SRCS
-  step/configuration/step_merge_tpk_config.cc
-  step/configuration/step_stash_tpk_config.cc
-  step/encryption/step_encrypt_resources.cc
-  hybrid_installer.cc
-)
-ADD_LIBRARY(${TARGET_LIBNAME_HYBRID} STATIC ${SRCS})
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} HYBRID_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/configuration HYBRID_STEP_CONFIGURATION_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/encryption HYBRID_STEP_ENCRYPTION_SRCS)
+ADD_LIBRARY(${TARGET_LIBNAME_HYBRID} STATIC
+  ${HYBRID_SRCS}
+  ${HYBRID_STEP_CONFIGURATION_SRCS}
+  ${HYBRID_STEP_ENCRYPTION_SRCS})
 
 TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_HYBRID} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../")
 
diff --git a/src/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt
index 8b21686..8334362 100755
--- a/src/wgt/CMakeLists.txt
+++ b/src/wgt/CMakeLists.txt
@@ -1,31 +1,10 @@
 # Target - sources
-SET(SRCS
-  step/configuration/step_check_rds_manifest.cc
-  step/configuration/step_check_start_files.cc
-  step/configuration/step_parse.cc
-  step/configuration/step_set_old_signature_files_location.cc
-  step/encryption/step_encrypt_resources.cc
-  step/encryption/step_remove_encryption_data.cc
-  step/filesystem/step_copy_preview_icons.cc
-  step/filesystem/step_create_symbolic_link.cc
-  step/filesystem/step_wgt_patch_icons.cc
-  step/filesystem/step_wgt_patch_storage_directories.cc
-  step/filesystem/step_wgt_prepare_package_directory.cc
-  step/filesystem/step_wgt_resource_directory.cc
-  step/filesystem/step_wgt_update_package_directory.cc
-  step/pkgmgr/step_generate_xml.cc
-  step/security/step_add_default_privileges.cc
-  step/security/step_check_settings_level.cc
-  step/security/step_check_wgt_background_category.cc
-  step/security/step_check_wgt_notification_category.cc
-  step/security/step_check_wgt_ime_privilege.cc
-  step/security/step_direct_manifest_check_signature.cc
-  step/security/step_check_extension_privileges.cc
-  step/security/step_wgt_recover_signature.cc
-  wgt_app_query_interface.cc
-  wgt_installer.cc
-  extension_config_parser.cc
-)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} WGT_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/configuration WGT_STEP_CONFIGURATION_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/encryption WGT_STEP_ENCRYPTION_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/filesystem WGT_STEP_FILESYSTEM_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/pkgmgr WGT_STEP_PKGMGR_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/security WGT_STEP_SECURITY_SRCS)
 
 IF(WRT_LAUNCHER)
     ADD_DEFINITIONS("-DWRT_LAUNCHER=\"${WRT_LAUNCHER}\"")
@@ -35,7 +14,13 @@ ELSE(WRT_LAUNCHER)
 ENDIF(WRT_LAUNCHER)
 
 # Target - definition
-ADD_LIBRARY(${TARGET_LIBNAME_WGT} STATIC ${SRCS})
+ADD_LIBRARY(${TARGET_LIBNAME_WGT} STATIC
+  ${WGT_SRCS}
+  ${WGT_STEP_CONFIGURATION_SRCS}
+  ${WGT_STEP_ENCRYPTION_SRCS}
+  ${WGT_STEP_FILESYSTEM_SRCS}
+  ${WGT_STEP_PKGMGR_SRCS}
+  ${WGT_STEP_SECURITY_SRCS})
 # Target - includes
 TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_WGT} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../")
 # Target - deps
-- 
2.7.4