Skip to content

GitLab

OpenFlipper-Free
OpenFlipper-Free
Commit 3b029184 authored by Jan Möbius's avatar Jan Möbius
Browse files
Options

Updated cmakelists to handle ui files in objecttypes

parent e6378116
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
CMakeLists.txt
View file @ 3b029184
...@@ -312,7 +312,8 @@ foreach (DATATYPE_DIR ${_data_types}) ...@@ -312,7 +312,8 @@ foreach (DATATYPE_DIR ${_data_types})
string(TOUPPER ${TYPENAME} TYPENAME ) string(TOUPPER ${TYPENAME} TYPENAME )
list(APPEND TYPE_LIST ${TYPENAME}) list(APPEND TYPE_LIST ${TYPENAME})
set(${TYPENAME}_INCLUDE ${CMAKE_SOURCE_DIR}/${DATATYPE_DIR}/../../ ) # Binary is only for the ui files generated there. Maybe a better solution can be found!
set(${TYPENAME}_INCLUDE ${CMAKE_SOURCE_DIR}/${DATATYPE_DIR}/../../ ${CMAKE_BINARY_DIR}/${DATATYPE_DIR}/ )
endif() endif()
endforeach() endforeach()
......
OpenFlipper/cmake/CMakeLists.txt
View file @ 3b029184
...@@ -312,7 +312,8 @@ foreach (DATATYPE_DIR ${_data_types}) ...@@ -312,7 +312,8 @@ foreach (DATATYPE_DIR ${_data_types})
string(TOUPPER ${TYPENAME} TYPENAME ) string(TOUPPER ${TYPENAME} TYPENAME )
list(APPEND TYPE_LIST ${TYPENAME}) list(APPEND TYPE_LIST ${TYPENAME})
set(${TYPENAME}_INCLUDE ${CMAKE_SOURCE_DIR}/${DATATYPE_DIR}/../../ ) # Binary is only for the ui files generated there. Maybe a better solution can be found!
set(${TYPENAME}_INCLUDE ${CMAKE_SOURCE_DIR}/${DATATYPE_DIR}/../../ ${CMAKE_BINARY_DIR}/${DATATYPE_DIR}/ )
endif() endif()
endforeach() endforeach()
......
Markdown is supported
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