Deukhoofd
/
Arbutils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Link everything statically if StaticC is defined.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-05-03 12:31:23 +02:00
parent f99243481e
commit 444816ce1b
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -28,9 +28,9 @@ if (WINDOWS)
endif (WINDOWS) endif (WINDOWS)
if (STATICC) if (STATICC)
target_link_libraries(Arbutils -static-libgcc -static-libstdc++) target_link_libraries(Arbutils -static -static-libgcc -static-libstdc++)
if (NOT DEFINED CONAN_EXPORTED) if (NOT DEFINED CONAN_EXPORTED)
target_link_libraries(ArbutilsTests -static-libgcc -static-libstdc++) target_link_libraries(ArbutilsTests -static -static-libgcc -static-libstdc++)
endif() endif()
endif(STATICC) endif(STATICC)

4
conanfile.py
View File

@ -32,10 +32,6 @@ class ArbutilsConan(ConanFile):
cmake.configure() cmake.configure()
cmake.build() 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): def package(self):
self.copy("*.hpp", dst="include/Arbutils", src="src") self.copy("*.hpp", dst="include/Arbutils", src="src")
self.copy("*.dll", dst="bin", keep_path=False) self.copy("*.dll", dst="bin", keep_path=False)