From a5bc5365eb547be55e78b7bdfd36762f275ae039 Mon Sep 17 00:00:00 2001
From: Sergey Yakubov <sergey.yakubov@desy.de>
Date: Wed, 16 Dec 2020 15:39:06 +0100
Subject: [PATCH] update cmakelists
---
CMakeLists.txt | 4 +++-
common/cpp/CMakeLists.txt | 8 ++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7c2703a2..760c62c23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,6 +138,8 @@ set(CPACK_PACKAGE_VERSION ${ASAPO_VERSION})
set(CPACK_PACKAGE_RELEASE ${PACKAGE_RELEASE_SUFFIX})
set(CPACK_PACKAGE_CONTACT "IT")
set(CPACK_PACKAGE_VENDOR "DESY")
-set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+IF(NOT WIN32)
+ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+endif()
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
include(CPack)
diff --git a/common/cpp/CMakeLists.txt b/common/cpp/CMakeLists.txt
index 4ef322e21..f59ad1bcf 100644
--- a/common/cpp/CMakeLists.txt
+++ b/common/cpp/CMakeLists.txt
@@ -19,14 +19,14 @@ if(NOT BUILD_CLIENTS_ONLY)
endif()
install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/common
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo
+ DESTINATION include/asapo
PATTERN "*.h.in" EXCLUDE)
install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/logger
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo )
+ DESTINATION include/asapo )
install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/asapo_fabric
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo)
+ DESTINATION include/asapo)
install(DIRECTORY ${ASAPO_CXX_COMMON_INCLUDE_DIR}/asapo/preprocessor
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include/asapo)
+ DESTINATION include/asapo)
--
GitLab