Commit aad5ddad authored by Markus Mirz's avatar Markus Mirz
Browse files

small fixes

parent b90dadc7
......@@ -6,6 +6,7 @@ Build
Results
Logs
.idea
.vs
# CMake
CMakeFiles/
......
......@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.5)
project(DPsimExample)
# library configuration etc.
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../Libraries/eigen)
set(EIGEN3_INCLUDE_DIR ../Libraries/eigen)
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../Libraries/eigen)
set(EIGEN3_INCLUDE_DIR ../../Libraries/eigen)
else()
find_package(Eigen3 REQUIRED)
endif()
......
......@@ -19,6 +19,13 @@ else()
find_package(Eigen3 REQUIRED)
endif()
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../Libraries/CIMpp)
set(CIMPP_INCLUDE_DIR ../Libraries/CIMpp/include/src)
set(CIM_INCLUDE_DIR ../Libraries/CIMpp/include/16v29a_12v08)
else()
find_package(CIMpp REQUIRED)
endif()
set(Python_ADDITIONAL_VERSIONS 3.5 3.6 3.7)
find_package(PythonInterp 3.5)
find_package(PythonLibs 3.5)
......@@ -33,10 +40,9 @@ else(APPLE)
set(PYTHON_MODULE_SUFFIX "so")
endif()
include_directories(${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS})
set(COMPONENTS_INCLUDE_DIR Components/)
set(USE_CIM_VERSION "IEC61970_16v29a")
add_subdirectory(CIM-XML-Parser)
include_directories(${EIGEN3_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${CIMPP_INCLUDE_DIR} ${COMPONENTS_INCLUDE_DIR} ${CIM_INCLUDE_DIR})
file(GLOB SOURCES *.cpp Components/*.cpp)
add_library(dpsim SHARED ${SOURCES})
......
......@@ -23,7 +23,7 @@
#pragma once
#include "Components.h"
#include "BaseComponent.h"
namespace DPsim {
......
......@@ -21,7 +21,7 @@
*********************************************************************************/
#include "SimplifiedSynchronGeneratorEMT.h"
#include "IntegrationMethod.h"
#include "../IntegrationMethod.h"
using namespace DPsim;
......
......@@ -21,7 +21,7 @@
*********************************************************************************/
#include "SynchronGeneratorDP.h"
#include "IntegrationMethod.h"
#include "../IntegrationMethod.h"
using namespace DPsim;
......
......@@ -21,7 +21,7 @@
*********************************************************************************/
#include "SynchronGeneratorEMT.h"
#include "IntegrationMethod.h"
#include "../IntegrationMethod.h"
using namespace DPsim;
......
......@@ -23,7 +23,8 @@
#pragma once
#include "Components.h"
#include "BaseComponent.h"
#include "InductorDP.h"
namespace DPsim {
......
......@@ -21,7 +21,7 @@
*********************************************************************************/
#include "VoltageBehindReactanceDP.h"
#include "IntegrationMethod.h"
#include "../IntegrationMethod.h"
using namespace DPsim;
......
......@@ -21,7 +21,7 @@
*********************************************************************************/
#include "VoltageBehindReactanceEMT.h"
#include "IntegrationMethod.h"
#include "../IntegrationMethod.h"
using namespace DPsim;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment