Skip to content
Snippets Groups Projects

remove qt GUI, in preparation for new react gui in v1.0

Merged Benjamin Hohl requested to merge benni/opSimulation:feature/203-remove-qt-gui into develop
1 unresolved thread
517+ files
+ 38
49656
Compare changes
  • Side-by-side
  • Inline
Files
517+
+ 7
17
@@ -82,9 +82,8 @@ endif()
# [LIBRARIES <libraries>]
# [UIS <qt_uis>]
# [LINKOSI [shared|static]]
# [LINKGUI]
# [FOLDER <category>]
# [COMPONENT <gui|sim|core|bin|module>])
# [COMPONENT <sim|core|bin|module>])
#
# For building libraries:
# add_openpass_target(NAME <target> TYPE library
@@ -95,9 +94,8 @@ endif()
# [LIBRARIES <libraries>]
# [UIS <qt_uis>]
# [LINKOSI [shared|static]]
# [LINKGUI]
# [FOLDER <category>]
# [COMPONENT <gui|sim|core|bin|module>])
# [COMPONENT <sim|core|bin|module>])
#
# For building tests:
# add_openpass_target(NAME <target> TYPE test
@@ -107,12 +105,11 @@ endif()
# [LIBRARIES <libraries>]
# [UIS <qt_uis>]
# [LINKOSI [shared|static]]
# [LINKGUI]
# [DEFAULT_MAIN]
# [SIMCORE_DEPS <dependencies>]
# [RESOURCES <directories>]
# [FOLDER <category>]
# [COMPONENT <gui|sim|core|bin|module>])
# [COMPONENT <sim|core|bin|module>])
#
# NAME Specifies the target name, has to be unique
# TYPE Type of the target to build (executable, library or test)
@@ -123,7 +120,6 @@ endif()
# INCDIRS Additional include directories
# LIBRARIES Additional libraries to link
# LINKOSI Shortcut for adding OSI include directories and libraries (incl. protobuf) as 'static' or 'shared' (default).
# LINKGUI Shortcut for adding GUI Libraries
# DEFAULT_MAIN Links a simple main() implementation for running GTest
# SIMCORE_DEPS Adds dependencies on simulation core targets to a test
# RESOURCES List of directories to be copied to the test executable's location before test execution
@@ -143,17 +139,15 @@ endif()
# - Target property DEBUG_POSTFIX is set to CMAKE_DEBUG_POSTFIX
##
function(add_openpass_target)
cmake_parse_arguments(PARSED_ARG "LINKGUI;DEFAULT_MAIN" "NAME;TYPE;LINKAGE;LINKOSI" "HEADERS;SOURCES;INCDIRS;LIBRARIES;UIS;SIMCORE_DEPS;RESOURCES;FOLDER;COMPONENT" ${ARGN})
cmake_parse_arguments(PARSED_ARG "DEFAULT_MAIN" "NAME;TYPE;LINKAGE;LINKOSI" "HEADERS;SOURCES;INCDIRS;LIBRARIES;UIS;SIMCORE_DEPS;RESOURCES;FOLDER;COMPONENT" ${ARGN})
if(TARGET ${PARSED_ARG_NAME})
message(STATUS "Target '${PARSED_ARG_NAME}' already defined. Skipping.")
else()
# TODO: different categories of libraries can be placed in different directories
# GUI Components are installed in their own gui directory as an example
if("${PARSED_ARG_COMPONENT}" STREQUAL "gui")
set (DESTDIR ${SUBDIR_LIB_GUI})
elseif("${PARSED_ARG_COMPONENT}" STREQUAL "core")
# Core Components are installed in their own core directory as an example
if("${PARSED_ARG_COMPONENT}" STREQUAL "core")
set (DESTDIR ${SUBDIR_LIB_CORE})
elseif("${PARSED_ARG_COMPONENT}" STREQUAL "bin")
set (DESTDIR .)
@@ -162,7 +156,7 @@ function(add_openpass_target)
elseif("${PARSED_ARG_COMPONENT}" STREQUAL "module")
set (DESTDIR ${SUBDIR_LIB_MODULES})
else()
message(FATAL_ERROR "Unknown COMPONENT '${PARSED_ARG_COMPONENT}' please use any one of 'gui', 'core', 'bin', 'common', or 'module'.")
message(FATAL_ERROR "Unknown COMPONENT '${PARSED_ARG_COMPONENT}' please use any one of 'core', 'bin', 'common', or 'module'.")
endif()
if("${PARSED_ARG_TYPE}" STREQUAL "library")
@@ -305,10 +299,6 @@ function(add_openpass_target)
$<$<CXX_COMPILER_ID:MSVC>:
-wd4251 -wd4335 -wd4250>)
if(${PARSED_ARG_LINKGUI})
qt5_use_modules(${PARSED_ARG_NAME} Core Gui Xml Widgets)
endif()
# locate shared library dependencies for test execution and add
# their location to PATH or LD_LIBRARY_PATH environment variable
if("${PARSED_ARG_TYPE}" STREQUAL "test")
Loading