diff --git a/GUI/coregui/CMakeLists.txt b/GUI/coregui/CMakeLists.txt index 9b84048d101bda700ddc9565bbaa0db4dfc4bed3..ff888bf08572f1620b0c775d98be7f3e84a2c746 100644 --- a/GUI/coregui/CMakeLists.txt +++ b/GUI/coregui/CMakeLists.txt @@ -85,11 +85,7 @@ endif() # --- making library --------- -add_library( - ${library_name} - SHARED - ${source_files} ${RC_SRCS} ${include_files} -) +add_library(${library_name} SHARED ${source_files} ${RC_SRCS} ${include_files}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set(${library_name}_LIBRARY_TYPE SHARED) # exposing library name and list of include directories outside @@ -101,7 +97,7 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE) if(BORNAGAIN_OPENGL) target_compile_definitions(${library_name} PUBLIC -DBORNAGAIN_OPENGL) endif() -target_include_directories(${library_name} PUBLIC ${QtAddOn_INCLUDE_DIRS} ${ba3d_INCLUDE_DIRS}) +target_include_directories(${library_name} PUBLIC ${QtAddOn_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}) target_include_directories(${library_name} PUBLIC ${include_dirs}) target_link_libraries(${library_name} ${QtAddOn_LIBRARIES} ${BornAgainCore_LIBRARY} ${ba3d_LIBRARY}) target_link_libraries(${library_name} diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h index f64b3a76c51c75991990fe696a767d0f384c57b4..3dbc1082721f020fb7fd8e83217735efca23025c 100644 --- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h +++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceBuilder.h @@ -15,7 +15,7 @@ #ifndef REALSPACEBUILDER_H #define REALSPACEBUILDER_H -#include "../../ba3d/view/camera.h" +#include "GUI/ba3d/view/camera.h" #include "WinDllMacros.h" #include <QVector3D> #include <QWidget>