From 444816ce1bb192433af5b51dad44312e33093229 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sun, 3 May 2020 12:31:23 +0200 Subject: [PATCH] Link everything statically if StaticC is defined. --- CMakeLists.txt | 4 ++-- conanfile.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b24907b..e191489 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,9 +28,9 @@ if (WINDOWS) endif (WINDOWS) if (STATICC) - target_link_libraries(Arbutils -static-libgcc -static-libstdc++) + target_link_libraries(Arbutils -static -static-libgcc -static-libstdc++) if (NOT DEFINED CONAN_EXPORTED) - target_link_libraries(ArbutilsTests -static-libgcc -static-libstdc++) + target_link_libraries(ArbutilsTests -static -static-libgcc -static-libstdc++) endif() endif(STATICC) diff --git a/conanfile.py b/conanfile.py index 4ef549d..23f83a5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -32,10 +32,6 @@ class ArbutilsConan(ConanFile): cmake.configure() cmake.build() - # Explicit way: - # self.run('cmake "%s/src" %s' % (self.source_folder, cmake.command_line)) - # self.run("cmake --build . %s" % cmake.build_config) - def package(self): self.copy("*.hpp", dst="include/Arbutils", src="src") self.copy("*.dll", dst="bin", keep_path=False)