diff --git a/CMakeLists.txt b/CMakeLists.txt index 18dbf549..956464e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,3 +169,25 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") include(CPack) endif(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") + +set(BINDIR "bin") +set(LIBDIR "lib") +if(UNIX) + # GNUInstallDirs is required for Debian multiarch + include(GNUInstallDirs) + set(LIBDIR ${CMAKE_INSTALL_LIBDIR}) + set(BINDIR ${CMAKE_INSTALL_BINDIR}) + + configure_file( + ${CMAKE_CURRENT_LIST_DIR}/src/libiec61850.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/src/libiec61850.pc @ONLY + ) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/src/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") +endif() + +install (TARGETS iec61850 iec61850-shared hal hal-shared + RUNTIME DESTINATION ${BINDIR} COMPONENT Applications + ARCHIVE DESTINATION ${LIBDIR} COMPONENT Libraries + LIBRARY DESTINATION ${LIBDIR} COMPONENT Libraries +) + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4cd9022c..82d62dc8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -345,22 +345,6 @@ target_link_libraries(iec61850-shared ) ENDIF(WITH_WPCAP) - -set(BINDIR "bin") -set(LIBDIR "lib") -if(UNIX) - # GNUInstallDirs is required for Debian multiarch - include(GNUInstallDirs) - set(LIBDIR ${CMAKE_INSTALL_LIBDIR}) - set(BINDIR ${CMAKE_INSTALL_BINDIR}) - - configure_file( - ${CMAKE_CURRENT_LIST_DIR}/libiec61850.pc.in - ${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc @ONLY - ) - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libiec61850.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig") -endif() - find_package(Doxygen) if(DOXYGEN_FOUND) configure_file(Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) @@ -371,8 +355,3 @@ if(DOXYGEN_FOUND) endif(DOXYGEN_FOUND) -install (TARGETS iec61850 iec61850-shared hal hal-shared - RUNTIME DESTINATION ${BINDIR} COMPONENT Applications - ARCHIVE DESTINATION ${LIBDIR} COMPONENT Libraries - LIBRARY DESTINATION ${LIBDIR} COMPONENT Libraries -)