Fix: deployments fail to install to a single tree
File names of same deployment built for different environments collide
which results in overwrites.
This patch makes the install locations environment specific to avoid
this issue. This also makes the install tree less confusing.
Change-Id: I05e45f7cdc5d05b4a695334ba66a29aadac2f08e
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/tools/cmake/common/ExportLibrary.cmake b/tools/cmake/common/ExportLibrary.cmake
index 670f318..fed4e75 100644
--- a/tools/cmake/common/ExportLibrary.cmake
+++ b/tools/cmake/common/ExportLibrary.cmake
@@ -1,5 +1,5 @@
#-------------------------------------------------------------------------------
-# Copyright (c) 2020, Arm Limited and Contributors. All rights reserved.
+# Copyright (c) 2020-2021, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
@@ -48,17 +48,17 @@
TARGETS ${MY_PARAMS_TARGET}
EXPORT ${MY_PARAMS_LIB_NAME}_targets
ARCHIVE
- DESTINATION lib
+ DESTINATION ${TS_ENV}/lib
LIBRARY
- DESTINATION lib
+ DESTINATION ${TS_ENV}/lib
PUBLIC_HEADER
- DESTINATION include
+ DESTINATION ${TS_ENV}/include
)
# Install library header files files
install(
FILES ${MY_PARAMS_INTERFACE_FILES}
- DESTINATION include
+ DESTINATION ${TS_ENV}/include
)
# Install the export details
@@ -66,7 +66,7 @@
EXPORT ${MY_PARAMS_LIB_NAME}_targets
FILE ${MY_PARAMS_LIB_NAME}_targets.cmake
NAMESPACE ${MY_PARAMS_LIB_NAME}::
- DESTINATION lib/cmake
+ DESTINATION ${TS_ENV}/lib/cmake
COMPONENT ${MY_PARAMS_LIB_NAME}
)
endfunction()