Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove option.fPIC for shared in conan new templates #13066

Merged
merged 2 commits into from
Feb 10, 2023
Merged

remove option.fPIC for shared in conan new templates #13066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04c1904
remove option.fPIC for shared
memsharded Feb 7, 2023
5fe3635
fix test
memsharded Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion conan/internal/api/new/autotools_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ class {{package_name}}Conan(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
basic_layout(self)
Expand Down
6 changes: 5 additions & 1 deletion conan/internal/api/new/bazel_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ class {{package_name}}Recipe(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
bazel_layout(self)
Expand Down
6 changes: 5 additions & 1 deletion conan/internal/api/new/cmake_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class {{package_name}}Recipe(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
cmake_layout(self)
Expand Down
6 changes: 5 additions & 1 deletion conan/internal/api/new/meson_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ class {{package_name}}Conan(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
basic_layout(self)
Expand Down
6 changes: 5 additions & 1 deletion conans/test/assets/pkg_cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ class Pkg(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
cmake_layout(self)
Expand Down
6 changes: 5 additions & 1 deletion conans/test/functional/toolchains/gnu/autotools/test_apple_toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class App(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def build(self):
env_build = Autotools(self)
Expand Down
2 changes: 1 addition & 1 deletion conans/test/functional/toolchains/gnu/autotools/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ class MyLibConan(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def layout(self):
basic_layout(self)
Expand Down
6 changes: 5 additions & 1 deletion conans/test/functional/toolchains/meson/test_backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ class App(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
self.folders.build = "build"
Expand Down
6 changes: 5 additions & 1 deletion conans/test/functional/toolchains/meson/test_cross_compilation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ def layout(self):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def generate(self):
tc = MesonToolchain(self)
Expand Down
6 changes: 5 additions & 1 deletion conans/test/functional/toolchains/meson/test_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ class App(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
self.folders.build = "build"
Expand Down
6 changes: 5 additions & 1 deletion conans/test/functional/toolchains/meson/test_meson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ class App(ConanFile):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def layout(self):
self.folders.generators = 'build/gen_folder'
Expand Down
6 changes: 5 additions & 1 deletion conans/test/functional/toolchains/meson/test_meson_and_objc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ def layout(self):

def config_options(self):
if self.settings.os == "Windows":
del self.options.fPIC
self.options.rm_safe("fPIC")

def configure(self):
if self.options.shared:
self.options.rm_safe("fPIC")

def generate(self):
tc = MesonToolchain(self)
Expand Down