diff options
author | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2014-06-03 14:26:06 +0200 |
---|---|---|
committer | Bartlomiej Grzelewski <b.grzelewski@samsung.com> | 2014-09-12 14:56:41 +0200 |
commit | 65b129fa689bc6be4086d1e16332acb5ae64bdbe (patch) | |
tree | 6b8294aa8578afc5680a4ed9dc0672c2b707b02f /build | |
parent | b69ec2c5cc822989ad6e5fc3d5fc53bb1b3d942b (diff) | |
download | key-manager-65b129fa689bc6be4086d1e16332acb5ae64bdbe.tar.gz key-manager-65b129fa689bc6be4086d1e16332acb5ae64bdbe.tar.bz2 key-manager-65b129fa689bc6be4086d1e16332acb5ae64bdbe.zip |
Move pc file to build directory.
Add dummy responses to Control protocol.
Change-Id: I76d44f1d0dc52daa455ea7283bfd2435715d3c7c
Diffstat (limited to 'build')
-rw-r--r-- | build/CMakeLists.txt | 12 | ||||
-rw-r--r-- | build/key-manager.pc.in (renamed from build/key-manager/key-manager.pc.in) | 0 | ||||
-rw-r--r-- | build/key-manager/CMakeLists.txt | 27 |
3 files changed, 10 insertions, 29 deletions
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 02ca0258..baf97d4a 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -13,7 +13,15 @@ # limitations under the License. # # @file CMakeLists.txt -# @author Tomasz Swierczek (t.swierczek@samsung.com) +# @author Barlomiej Grzelewski (b.grzelewski@samsung.com) +# @author Zofia Abramowska (z.abramowska@samsung.com) +# @brief # -ADD_SUBDIRECTORY(key-manager) +CONFIGURE_FILE(key-manager.pc.in key-manager.pc @ONLY) + +INSTALL(FILES + ${CMAKE_BINARY_DIR}/build/key-manager.pc + DESTINATION + ${LIB_INSTALL_DIR}/pkgconfig + ) diff --git a/build/key-manager/key-manager.pc.in b/build/key-manager.pc.in index f5167149..f5167149 100644 --- a/build/key-manager/key-manager.pc.in +++ b/build/key-manager.pc.in diff --git a/build/key-manager/CMakeLists.txt b/build/key-manager/CMakeLists.txt deleted file mode 100644 index 896cf6f8..00000000 --- a/build/key-manager/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# @file CMakeLists.txt -# @author Barlomiej Grzelewski (b.grzelewski@samsung.com) -# @author Zofia Abramowska (z.abramowska@samsung.com) -# @brief -# - -CONFIGURE_FILE(key-manager.pc.in key-manager.pc @ONLY) - -INSTALL(FILES - ${CMAKE_BINARY_DIR}/build/key-manager/key-manager.pc - DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig - ) |