diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-02-04 08:16:04 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2021-02-08 13:18:26 +0000 |
| commit | 4acff10f8582d8384a2875daa771b2777788995a (patch) | |
| tree | a8149b1402a285ef9923165a2af7a71542d3c311 /conanfile.py | |
| parent | 2a6e8629eb32d839aed4be0ba6257f6714602795 (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
Pick-to: 6.1
Task-number: QTBUG-90901
Change-Id: Ic71ac82b8b4bda0ae508680094bafc2d6c00ea13
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'conanfile.py')
| -rw-r--r-- | conanfile.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/conanfile.py b/conanfile.py index dba8255..b9d8598 100644 --- a/conanfile.py +++ b/conanfile.py @@ -43,9 +43,9 @@ class QtOPCUA(ConanFile): description = "The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack." topics = ("qt", "qt6", "OPC UA", "OPCUA") 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 QtOPCUA(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 |