diff --git a/CMakeLists.txt b/CMakeLists.txt index 3610011..01a9b0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ ENABLE_TESTING() set(LIB_VERSION_MAJOR "1") set(LIB_VERSION_MINOR "0") -set(LIB_VERSION_PATCH "0") +set(LIB_VERSION_PATCH "1") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/third_party/cmake/modules/") @@ -136,7 +136,7 @@ INCLUDE(InstallRequiredSystemLibraries) 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") +SET(CPACK_PACKAGE_VENDOR "MZ Automation GmbH") SET(CPACK_PACKAGE_CONTACT "info@libiec61850.com") SET(CPACK_PACKAGE_VERSION_MAJOR "${LIB_VERSION_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${LIB_VERSION_MINOR}") diff --git a/pyiec61850/CMakeLists.txt b/pyiec61850/CMakeLists.txt index 328a996..3b5743b 100644 --- a/pyiec61850/CMakeLists.txt +++ b/pyiec61850/CMakeLists.txt @@ -17,7 +17,7 @@ EXECUTE_PROCESS ( #Finding python modules install path "import site, sys; sys.stdout.write(site.getsitepackages()[-1])" OUTPUT_VARIABLE PYTHON_SITE_DIR ) -INSTALL ( FILES ${CMAKE_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) +INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/iec61850.py DESTINATION ${PYTHON_SITE_DIR}) INSTALL ( TARGETS _iec61850 LIBRARY DESTINATION ${PYTHON_SITE_DIR}) add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} test_pyiec61850.py) diff --git a/pyiec61850/iec61850.i b/pyiec61850/iec61850.i index 74af469..e8dbcb8 100644 --- a/pyiec61850/iec61850.i +++ b/pyiec61850/iec61850.i @@ -35,7 +35,7 @@ DataAttribute* toDataAttribute(ModelNode * MN) %include "iec61850_server.h" %include "iec61850_dynamic_model.h" %include "iec61850_cdc.h" -%include "linked_list.h +%include "linked_list.h" ModelNode* toModelNode(LogicalNode *); ModelNode* toModelNode(DataObject *); DataAttribute* toDataAttribute(DataObject *);