From 922f3055b4a35a61dba66649eec7467f7b7828ff Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 7 Mar 2020 11:42:46 +0100 Subject: [PATCH] - updated cmake files to work with cmake 2.8 --- CMakeLists.txt | 22 +--------------------- hal/CMakeLists.txt | 15 +++++++++++++++ src/CMakeLists.txt | 21 +++++++++++++++++++++ 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 956464e3..85caf202 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12) # automagically detect if we should cross-compile if(DEFINED ENV{TOOLCHAIN}) @@ -170,24 +170,4 @@ 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/hal/CMakeLists.txt b/hal/CMakeLists.txt index bdd1a9c6..65e8e404 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -164,3 +164,18 @@ target_link_libraries(hal ${CMAKE_CURRENT_SOURCE_DIR}/../third_party/winpcap/Lib/packet.lib ) 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}) +endif() + +install (TARGETS 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 82d62dc8..ff2ee08b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -355,3 +355,24 @@ if(DOXYGEN_FOUND) endif(DOXYGEN_FOUND) +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() + +install (TARGETS iec61850 iec61850-shared + RUNTIME DESTINATION ${BINDIR} COMPONENT Applications + ARCHIVE DESTINATION ${LIBDIR} COMPONENT Libraries + LIBRARY DESTINATION ${LIBDIR} COMPONENT Libraries +) +