- updated cmake files to work with cmake 2.8

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
-)
 

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
+)

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
+)
+