Skip to content

Commit 4007d72

Browse files
committed
Revert "CMake: only set Qt5 variables if Qt5 is used to remove superfluous warnings"
This reverts commit 89570d7.
1 parent dcb84eb commit 4007d72

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

LSLCMake.cmake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Common functions and settings for LSL
22

3-
message(STATUS "Included LSL CMake helpers, rev. 10")
3+
message(STATUS "Included LSL CMake helpers, rev. 9")
44

55
# set build type and default install dir if not done already
66
if(NOT CMAKE_BUILD_TYPE)
@@ -43,6 +43,13 @@ endif()
4343

4444
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "limited configs" FORCE)
4545

46+
# Qt5
47+
set(CMAKE_INCLUDE_CURRENT_DIR ON) # Because the ui_mainwindow.h file.
48+
# Enable automatic compilation of .cpp->.moc, xy.ui->ui_xy.h and resource files
49+
set(CMAKE_AUTOMOC ON)
50+
set(CMAKE_AUTOUIC ON)
51+
set(CMAKE_AUTORCC ON)
52+
4653
# Boost
4754
#SET(Boost_DEBUG OFF) #Switch this and next to ON for help debugging Boost problems.
4855
#SET(Boost_DETAILED_FAILURE_MSG ON)
@@ -127,13 +134,6 @@ function(installLSLAppSingleFolder target)
127134
# do we need to install with Qt5?
128135
get_target_property(TARGET_LIBRARIES ${target} LINK_LIBRARIES)
129136
if(";${TARGET_LIBRARIES}" MATCHES ";Qt5::")
130-
# Qt5
131-
set(CMAKE_INCLUDE_CURRENT_DIR ON) # Because the ui_mainwindow.h file.
132-
# Enable automatic compilation of .cpp->.moc, xy.ui->ui_xy.h and resource files
133-
set(CMAKE_AUTOMOC ON)
134-
set(CMAKE_AUTOUIC ON)
135-
set(CMAKE_AUTORCC ON)
136-
137137
if(WIN32)
138138
findQtInstallationTool("windeployqt")
139139
if (QT_DEPLOYQT_EXECUTABLE)

0 commit comments

Comments
 (0)