From e4d74dce9af5e885f0f26b4f9d2f693b358b6455 Mon Sep 17 00:00:00 2001 From: Mollie Munoz Date: Tue, 17 Aug 2021 18:19:09 -0700 Subject: [PATCH] Revert all c-utility install location changes (#543) --- CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fd0d2296..8f8026072 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -683,18 +683,13 @@ else(${build_as_dynamic}) set(targets aziotsharedutil) endif(${build_as_dynamic}) -set(cmake_install_include_dir ${CMAKE_INSTALL_INCLUDEDIR}) -if (${use_installed_dependencies}) - set(cmake_install_include_dir ${CMAKE_INSTALL_INCLUDEDIR}/azureiot) -endif() - install (TARGETS ${targets} EXPORT aziotsharedutilTargets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/../bin - INCLUDES DESTINATION ${cmake_install_include_dir} + INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot ) -install (FILES ${source_h_files} DESTINATION ${cmake_install_include_dir}/azure_c_shared_utility) +install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot/azure_c_shared_utility) install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)