Skip to content

Commit 29c50c9

Browse files
magnesjgithub-actions[bot]
authored andcommitted
Fixes by cmake-format
1 parent 7b26cd8 commit 29c50c9

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

ApplicationExeCode/CMakeLists.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,11 +485,11 @@ if(RESINSIGHT_PRIVATE_INSTALL)
485485
install(FILES ${RESINSIGHT_FILES} DESTINATION ${RESINSIGHT_INSTALL_FOLDER})
486486

487487
if(WIN32 AND WINDEPLOYQT_EXECUTABLE)
488-
# Add a post-build command to run windeployqt. This makes it possible to debug
489-
# the binary from a debugger without any manual steps. This also fixes an
490-
# issue related to the Install() command and usage of windeployqt as part of
491-
# installation. The installation tried to use windeployqt on the executable in
492-
# the build directory, which did not find the Qt libraries.
488+
# Add a post-build command to run windeployqt. This makes it possible to
489+
# debug the binary from a debugger without any manual steps. This also fixes
490+
# an issue related to the Install() command and usage of windeployqt as part
491+
# of installation. The installation tried to use windeployqt on the
492+
# executable in the build directory, which did not find the Qt libraries.
493493
#
494494
# TODO: This command copies all required dlls, so we should probably not use
495495
# the Install() command to copy external dlls dependencies.
@@ -499,7 +499,8 @@ if(RESINSIGHT_PRIVATE_INSTALL)
499499
POST_BUILD
500500
COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:ResInsight> --release
501501
--no-translations
502-
COMMENT "Running windeployqt to deploy Qt dependencies to the build folder, required by install()"
502+
COMMENT
503+
"Running windeployqt to deploy Qt dependencies to the build folder, required by install()"
503504
)
504505

505506
# Running windeployqt to deploy Qt dependencies to the install folder"

ApplicationLibCode/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ if(RESINSIGHT_FOUND_HDF5)
215215

216216
endif()
217217

218-
219218
# ##############################################################################
220219
# Create source groups - see also included CMakeLists_files.cmake
221220
# ##############################################################################

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ set(VIZ_MODULES_FOLDER_NAME Fwk/VizFwk)
1010
# !!! For now, we force Qt to version 5
1111
set(CEE_USE_QT5 OFF)
1212
message(STATUS "Forcing setting of CEE_USE_QT6 to ON")
13-
set(CEE_USE_QT6 ON )
13+
set(CEE_USE_QT6 ON)
1414
message(STATUS "CEE_USE_QT6=${CEE_USE_QT6}")
1515

16-
1716
cmake_policy(SET CMP0020 NEW)
1817
if(POLICY CMP0077)
1918
cmake_policy(SET CMP0077 NEW)
@@ -556,7 +555,6 @@ set(QT_LIBRARIES
556555
)
557556
qt_standard_project_setup()
558557

559-
560558
# Open GL
561559
find_package(OpenGL)
562560

@@ -788,7 +786,6 @@ endif()
788786
# Vizualization Framework
789787
# ##############################################################################
790788

791-
792789
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibCore)
793790
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibGeometry)
794791
add_subdirectory(${VIZ_MODULES_FOLDER_NAME}/LibRender)

0 commit comments

Comments
 (0)