Fix installation paths

This commit allows build/install without GBS.

Change-Id: Ie80a0baa50b868db01c7d00faad82a91de996ddf

diff --git a/dcm-client/CMakeLists.txt b/dcm-client/CMakeLists.txt
index cca4874..021af77 100644 (file)
--- a/dcm-client/CMakeLists.txt
+++ b/dcm-client/CMakeLists.txt
@@ -77,10 +77,12 @@ set_property(TARGET device-certificate-manager PROPERTY CXX_VISIBILITY_PRESET hi
 install(TARGETS device-certificate-manager
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/device_certificate_manager_export.h
+install(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/device_certificate_manager_export.h
        dcm_client.h
        device_certificate_manager.h
        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/device-certificate-manager)
 
-install(FILES dcm_support.pb.h
+install(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/dcm_support.pb.h
        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/device-certificate-manager-backend)

diff --git a/pkgconfig/CMakeLists.txt b/pkgconfig/CMakeLists.txt
index 7d9321a..f1362bb 100644 (file)
--- a/pkgconfig/CMakeLists.txt
+++ b/pkgconfig/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2019 - 2020 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.
@@ -16,20 +16,10 @@
 # @author      Pawel Kowalski <p.kowalski2@partner.samsung.com>
 #
 
-CONFIGURE_FILE(device-certificate-manager.pc.in
-       ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.pc
-       @ONLY
-)
+CONFIGURE_FILE(device-certificate-manager.pc.in device-certificate-manager.pc @ONLY)
+CONFIGURE_FILE(device-certificate-manager-backend.pc.in device-certificate-manager-backend.pc @ONLY)
 
-CONFIGURE_FILE(device-certificate-manager-backend.pc.in
+INSTALL(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.pc
        ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager-backend.pc
-       @ONLY
-)
-
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.pc
-       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
-
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager-backend.pc
-       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
+       DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

diff --git a/rpm/CMakeLists.txt b/rpm/CMakeLists.txt
index 8f0f16e..04a2998 100644 (file)
--- a/rpm/CMakeLists.txt
+++ b/rpm/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2019 - 2020 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.
@@ -16,11 +16,8 @@
 # @author       Pawel Kowalski (p.kowalski2@partner.samsung.com)
 #
 
-CONFIGURE_FILE(macros.dcm-backend-api.in
-       ${CMAKE_CURRENT_BINARY_DIR}/macros.dcm-backend-api
-       @ONLY
-)
+CONFIGURE_FILE(macros.dcm-backend-api.in macros.dcm-backend-api @ONLY)
 
-INSTALL(FILES macros.dcm-backend-api
-       DESTINATION ${RPM_DIR}
-)
+INSTALL(FILES
+       ${CMAKE_CURRENT_BINARY_DIR}/macros.dcm-backend-api
+       DESTINATION ${RPM_DIR})

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 78946f5..984d788 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,17 +1,29 @@
-configure_file(device-certificate-manager.service.in
-       ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.service
-       @ONLY)
+# Copyright (c) 2017 - 2020 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         systemd/CMakeLists.txt
+# @author      Dariusz Michaluk <d.michaluk@samsung.com>
+# @author      Jaroslaw Pelczar <j.pelczar@samsung.com>
 
-configure_file(device-certificate-manager.socket.in
-       ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.socket
-       @ONLY)
+configure_file(device-certificate-manager.service.in device-certificate-manager.service @ONLY)
+configure_file(device-certificate-manager.socket.in device-certificate-manager.socket @ONLY)
 
 IF(NOT ("${SYSTEMD_UNIT_DIR}" STREQUAL ""))
 
 install(FILES
        ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.service
        ${CMAKE_CURRENT_BINARY_DIR}/device-certificate-manager.socket
-       DESTINATION
-       ${SYSTEMD_UNIT_DIR})
+       DESTINATION ${SYSTEMD_UNIT_DIR})
 
 ENDIF()