Skip to content

Commit e4d74dc

Browse files
authored
Revert all c-utility install location changes (#543)
1 parent 5edd354 commit e4d74dc

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

CMakeLists.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -683,18 +683,13 @@ else(${build_as_dynamic})
683683
set(targets aziotsharedutil)
684684
endif(${build_as_dynamic})
685685

686-
set(cmake_install_include_dir ${CMAKE_INSTALL_INCLUDEDIR})
687-
if (${use_installed_dependencies})
688-
set(cmake_install_include_dir ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)
689-
endif()
690-
691686
install (TARGETS ${targets} EXPORT aziotsharedutilTargets
692687
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
693688
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
694689
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}/../bin
695-
INCLUDES DESTINATION ${cmake_install_include_dir}
690+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot
696691
)
697-
install (FILES ${source_h_files} DESTINATION ${cmake_install_include_dir}/azure_c_shared_utility)
692+
install (FILES ${source_h_files} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot/azure_c_shared_utility)
698693
install (FILES ${micromock_h_files_full_path} ${INSTALL_H_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/azureiot)
699694

700695

0 commit comments

Comments
 (0)