Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
CoMISo
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
4
Issues
4
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
CoMISo
CoMISo
Commits
37c652bf
Commit
37c652bf
authored
Jan 10, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Switched to autouic
parent
57fcf533
Pipeline
#8757
passed with stages
in 10 minutes and 3 seconds
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
6 deletions
+22
-6
Base
Base
+1
-1
CMakeLists.txt
CMakeLists.txt
+20
-4
QtWidgets/MISolverDialogUI.hh
QtWidgets/MISolverDialogUI.hh
+1
-1
No files found.
Base
@
18ae9c17
Compare
57ce0946
...
18ae9c17
Subproject commit
57ce0946d2d63c1499b83e4f798c2cfdf431d1e4
Subproject commit
18ae9c17c57401252a9a91dce678d88f99e9ff89
CMakeLists.txt
View file @
37c652bf
...
...
@@ -403,7 +403,7 @@ endif()
acg_append_files
(
headers
"*.hh"
${
directories
}
)
acg_append_files
(
sources
"*.cc"
${
directories
}
)
if
(
QT
4_FOUND OR QT
5_FOUND
)
if
(
QT5_FOUND
)
acg_append_files
(
ui
"*.ui"
${
directories
}
)
endif
()
...
...
@@ -426,16 +426,32 @@ of_list_filter ( sources )
acg_drop_templates
(
sources
)
if
(
QT5_FOUND
)
# genereate uic and moc targets
acg_qt5_autouic
(
uic_targets
${
ui
}
)
# Enable automoc
set
(
CMAKE_AUTOMOC ON
)
set
(
CMAKE_AUTOUIC ON
)
list
(
APPEND COMISO_LINK_LIBRARIES
${
QT_LIBRARIES
}
)
endif
()
acg_add_library
(
CoMISo SHARED
${
ui
}
${
sources
}
${
headers
}
)
if
(
QT5_FOUND
)
if
(
NOT WIN32
)
# Allow targets depending on ACG find the autogenerated header files
target_include_directories
(
CoMISo PUBLIC
${
CMAKE_CURRENT_BINARY_DIR
}
/CoMISo_autogen/include
)
else
()
# Allow targets depending on ACG find the autogenerated header files
target_include_directories
(
CoMISo PUBLIC
$<$<CONFIG:Debug>:
${
CMAKE_CURRENT_BINARY_DIR
}
/CoMISo_autogen/include_Debug/>
$<$<CONFIG:Release>:
${
CMAKE_CURRENT_BINARY_DIR
}
/CoMISo_autogen/include_Release/>
)
endif
()
endif
()
acg_add_library
(
CoMISo SHARED
${
uic_targets
}
${
sources
}
${
headers
}
)
if
(
NOT APPLE
)
target_link_libraries
(
CoMISo
...
...
QtWidgets/MISolverDialogUI.hh
View file @
37c652bf
...
...
@@ -42,7 +42,7 @@
//== INCLUDES =================================================================
#include "ui_QtMISolverDialogBaseUI.h
h
"
#include "ui_QtMISolverDialogBaseUI.h"
// ACGMake users have to include
// #include "QtMISolverDialogBase.hh"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment