8 Commits
Author SHA1 Message Date
Eirik Marthinsen 5cfabbb8b8 Use correct qt version check for SkipEmptyParts
Qt::SkipEmptyParts was introduced in Qt 5.14 and QString::SkipEmptyParts
was deprecated in Qt 5.15. This will avoid warnings when compiling with
Qt 5.15.
2024-02-15 09:48:34 +01:00
Eirik Marthinsen 4c77090d8b Add missing Qt component to silence CMake warnings
The project cafProjectDataModel_UnitTests was triggering multiple
CMake warnings saying that the Widget component was missing when trying
to collect dependencies.
2024-02-04 15:59:09 +01:00
Eirik Marthinsen 1f1904d72b Add dependency on QtSvg for project cafUserInterface
The project cafUserInterface requires the library QtSvg because of the
use of QSvgRenderer in cafUiIconFactory.cpp. The library has to be
linked into the final executable. The target introdicing the dependency
should also be the one specifying it.

This allows us to remove the dependency from targets that doesn't
directly use QtSvg at all.

Closes #10955
2023-12-16 17:39:09 +01:00
Eirik Marthinsen 9701866736 CMake: Update/Remove old minimum version check
- Update the minimum required CMake version to 3.15 for Fwk folders
  that might be used as top level projects.
- Remove the minimum required CMake version from projects that is just
  included from other top level projects.

Since version 3.19 CMake has been warning that CMake versions below 3.5
is deprecated and support will be removed in the future. This will
silence those warning.

By removing the minimum required version check from projects that is not
intended as top level projects we avoid redundant checks and simplifies
future maintenance.

Closes #10957
2023-12-16 17:35:54 +01:00
Eirik Marthinsen 77e5d642e9 Fix insufficient forward declaration
It is not sufficient with a forward declaration of QString here. Since
the vector is created in PdmFieldCapability::attributes() the size of
QString must be known at that point.

closes #10950
2023-12-13 18:40:09 +01:00
Eirik Marthinsen 316cb222d9 CMake: Add fast_float to list of submodules to init
CMake is set to import submodules by default but fast_float was missing
from the list.
2022-02-07 13:10:13 +01:00
Eirik Marthinsen 200d5c65a3 AutoVcpkg: Include Vcpkg toolchain
Include the Vcpkg toolchain file after the installation of the first
package.

When building for the first time from a clean source tree, the Vcpkg
toolchain file does not exist. At the same time CMake is only reading
the toolchain file the very first time it is configuring, but since the
toolchain file is only created when vcpkg is configured on the first
call to vcpkg_install it will never read it. So it is not enough to just
reconfigure.

Note: It is not ideal to include it here since one might at some point
install and search for a package at an erlier point in the script and
fail to find it.

Alternative approaces that I considered:
- Include this file right after including AutoVcpkg. This would require
  1 recompilation for the file to be found and read which is
  unfortunate.
- Include this file in the config function in AutoVcpkg. This seemed
  difficult without including the file for every call to vcpkg_install,
  which seems unecessary.
2021-08-30 19:40:35 +02:00
Eirik Marthinsen 697da887c4 AutoVcpkg: Copy bootstrap file from cmake folder
AutoVcpkg assumed that the bootstrap file was in the root project
folder, and not in a cmake subfolder.

Note: It is not correct to use ${CMAKE_CURRENT_LIST_DIR} since this is
inside a function and whould still refer to the folder of the calling
file. The more elegant solution would be to use
${CMAKE_CURRENT_FUNCTION_LIST_DIR}, but that is not available until
CMake 3.17.
2021-08-30 19:40:35 +02:00