diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-02-04 08:19:22 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-08 14:31:53 +0000 |
| commit | 8268c197f613f743fb3dd8c82606e35beaf3dfde (patch) | |
| tree | 65e0f348d9a292f97309db9069000f99ae1efbd9 | |
| parent | 24a3f2823a85acafcaea85adcaa1410934113698 (diff) | |
Conan: Use the 'shared' option value of the Qt build
Default to the value of the prebuilt Qt build.
The 'default' needs to be added as valid option in the list which
will be used by default if no value is given by the user or via
the conan profile.
The user is still able to override this via the profile or from
command line if needed:
"conan install ... -o shared=False"
CMakeCache.txt:
- "conan install ..."
- BUILD_SHARED_LIBS:BOOL=ON
- "conan install ... -o shared=True"
- BUILD_SHARED_LIBS:BOOL=ON
- "conan install ... -o shared=False"
- BUILD_SHARED_LIBS:BOOL=OFF
Task-number: QTBUG-90901
Change-Id: Ia4ec520b06990e93778bf804231b9cb8d2f4843e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
(cherry picked from commit 72841fe10402148de78c218d06bf1a1f3d3857d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | conanfile.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/conanfile.py b/conanfile.py index 746516c..3f522bd 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,9 +43,9 @@ class QtScxml(ConanFile): description = "Qt Statemachine and SCXML Statemachine support." topics = ("qt", "qt6", "statemachine", "scxml") settings = "os", "compiler", "build_type", "arch" - options = {"shared": [True, False], + options = {"shared": [True, False, "default"], "qt6": "ANY"} # this is needed to model unique package_id for the Add-on build per used Qt6 version - default_options = {"shared": False, + default_options = {"shared": "default", # default: Use the value of the Qt build "qt6": None} exports_sources = "*", "!conan*.*" @@ -87,6 +87,10 @@ class QtScxml(ConanFile): install_dir = os.path.join(os.getcwd(), "_install_tmp") cmake.definitions["CMAKE_INSTALL_PREFIX"] = install_dir + # Use the value of the Qt build + if self.options.shared.value == "default": + del cmake.definitions["BUILD_SHARED_LIBS"] + cmake_toolchain_file = os.environ.get("CMAKE_TOOLCHAIN_FILE") if cmake_toolchain_file: cmake.definitions["CMAKE_TOOLCHAIN_FILE"] = cmake_toolchain_file |