Skip to content
Snippets Groups Projects
Commit 7be49f96 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

replace relative include path

parent 27384b44
No related branches found
No related tags found
No related merge requests found
...@@ -85,11 +85,7 @@ endif() ...@@ -85,11 +85,7 @@ endif()
# --- making library --------- # --- making library ---------
add_library( add_library(${library_name} SHARED ${source_files} ${RC_SRCS} ${include_files})
${library_name}
SHARED
${source_files} ${RC_SRCS} ${include_files}
)
set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix}) set_target_properties(${library_name} PROPERTIES PREFIX ${libprefix} SUFFIX ${libsuffix})
set(${library_name}_LIBRARY_TYPE SHARED) set(${library_name}_LIBRARY_TYPE SHARED)
# exposing library name and list of include directories outside # exposing library name and list of include directories outside
...@@ -101,7 +97,7 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE) ...@@ -101,7 +97,7 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
if(BORNAGAIN_OPENGL) if(BORNAGAIN_OPENGL)
target_compile_definitions(${library_name} PUBLIC -DBORNAGAIN_OPENGL) target_compile_definitions(${library_name} PUBLIC -DBORNAGAIN_OPENGL)
endif() 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_include_directories(${library_name} PUBLIC ${include_dirs})
target_link_libraries(${library_name} ${QtAddOn_LIBRARIES} ${BornAgainCore_LIBRARY} ${ba3d_LIBRARY}) target_link_libraries(${library_name} ${QtAddOn_LIBRARIES} ${BornAgainCore_LIBRARY} ${ba3d_LIBRARY})
target_link_libraries(${library_name} target_link_libraries(${library_name}
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef REALSPACEBUILDER_H #ifndef REALSPACEBUILDER_H
#define REALSPACEBUILDER_H #define REALSPACEBUILDER_H
#include "../../ba3d/view/camera.h" #include "GUI/ba3d/view/camera.h"
#include "WinDllMacros.h" #include "WinDllMacros.h"
#include <QVector3D> #include <QVector3D>
#include <QWidget> #include <QWidget>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment