- added packaging changes and DLL version information to cmake scripts (as suggested by cedric)

CMakeLists.txt

@@ -119,7 +119,7 @@ endif(BUILD_EXAMPLES)
 
 add_subdirectory(src)
 
-INSTALL(FILES ${API_HEADERS} DESTINATION include/libiec61850)
+INSTALL(FILES ${API_HEADERS} DESTINATION include/libiec61850 COMPONENT Development)
 
 IF(BUILD_PYTHON_BINDINGS)
 	add_subdirectory(pyiec61850)
@@ -128,10 +128,6 @@ ENDIF(BUILD_PYTHON_BINDINGS)
 IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 INCLUDE(InstallRequiredSystemLibraries)
  
-SET(CPACK_SET_DESTDIR "on")
-SET(CPACK_INSTALL_PREFIX "/usr")
-SET(CPACK_GENERATOR "DEB")
- 
 SET(CPACK_PACKAGE_DESCRIPTION "IEC 61850 MMS/GOOSE client and server library")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IEC 61850 MMS/GOOSE client and server library")
 SET(CPACK_PACKAGE_VENDOR "The libIEC61850 project")
@@ -142,10 +138,8 @@ SET(CPACK_PACKAGE_VERSION_PATCH "${LIB_VERSION_PATCH}")
 SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}_${CMAKE_SYSTEM_PROCESSOR}")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${LIB_VERSION_MAJOR}.${LIB_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
  
-SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+SET(CPACK_COMPONENTS_ALL Libraries Development Applications)
-SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+#set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CMAKE_PROJECT_NAME}")
- 
-SET(CPACK_COMPONENTS_ALL Libraries ApplicationData)
 INCLUDE(CPack)
  
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

src/CMakeLists.txt

@@ -287,6 +287,24 @@ ENDIF(WIN32)
 
 include (GenerateExportHeader)
 
+set(RES_FILES "")
+if ( WIN32 )
+	# Adding RC resource file for adding information to the archive
+	set(RES_FILES "${CMAKE_CURRENT_BINARY_DIR}/version.rc")
+	message(STATUS "Generating RC file : ${RES_FILES}")
+	configure_file(
+			${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in
+			${RES_FILES}
+			@ONLY)
+	if( MINGW )
+		set(CMAKE_RC_COMPILER_INIT windres)
+		ENABLE_LANGUAGE(RC)
+		SET(CMAKE_RC_COMPILE_OBJECT
+		"<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+	endif(MINGW)
+	set(library_SRCS ${library_SRCS} ${RES_FILES})
+endif( WIN32 )
+
 add_library (iec61850-shared SHARED ${library_SRCS} )
 
 set_target_properties(iec61850-shared PROPERTIES
@@ -348,10 +366,9 @@ endif()
 ENDIF(WITH_WPCAP)
 
 
-
 install (TARGETS iec61850 iec61850-shared
-	RUNTIME DESTINATION bin
+	RUNTIME DESTINATION bin COMPONENT Applications
-	ARCHIVE DESTINATION lib
+	ARCHIVE DESTINATION lib COMPONENT Libraries
-    LIBRARY DESTINATION lib
+    LIBRARY DESTINATION lib COMPONENT Libraries
 )