diff --git a/CMakeLists.txt b/CMakeLists.txt index 56bd936..13a862d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,8 +7,8 @@ set(CMAKE_BUILD_TYPE "Release" CACHE STRING "default build type") set(CMAKE_INSTALL_SO_NO_EXE False) set(CMAKE_LEGACY_CYGWIN_WIN32 False) -if (UNIX AND NOT CYGWIN) - set(CMD_LDCONFIG "ldconfig" CACHE STRING "ldconfig command") +if (UNIX) + find_program(LDCONFIG_EXECUTABLE "ldconfig") endif() project(arib_std_b25 C) @@ -91,7 +91,7 @@ if(UNIX AND NOT CYGWIN) install(TARGETS arib25-static arib25-shared ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) install(FILES src/arib_std_b25.h src/b_cas_card.h src/multi2.h src/ts_section_parser.h src/portable.h ${CMAKE_CURRENT_BINARY_DIR}/arib25_api.h DESTINATION include/arib25) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${ARIB25_LIB_NAME}.pc DESTINATION lib/pkgconfig) - install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DCMD_LDCONFIG=${CMD_LDCONFIG} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)") + install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -DLDCONFIG_EXECUTABLE=${LDCONFIG_EXECUTABLE} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/PostInstall.cmake)") add_custom_target(uninstall ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake) endif() diff --git a/cmake/PostInstall.cmake b/cmake/PostInstall.cmake index 4cee8b4..473a7d3 100644 --- a/cmake/PostInstall.cmake +++ b/cmake/PostInstall.cmake @@ -1,6 +1,7 @@ -message(STATUS "Running: ldconfig") - -execute_process(COMMAND ${CMD_LDCONFIG} RESULT_VARIABLE ldconfig_result) -if (NOT ldconfig_result EQUAL 0) - message(WARNING "ldconfig failed") +if(LDCONFIG_EXECUTABLE) + message(STATUS "Running: ldconfig") + execute_process(COMMAND ${LDCONFIG_EXECUTABLE} RESULT_VARIABLE ldconfig_result) + if (NOT ldconfig_result EQUAL 0) + message(WARNING "ldconfig failed") + endif() endif()