mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 22:40:05 +00:00
Add oneTBB to Linux build for PSTL
This commit is contained in:
parent
ea6134acea
commit
a21377ce6c
3 changed files with 39 additions and 31 deletions
33
conanfile.py
Normal file
33
conanfile.py
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
from conans import ConanFile
|
||||||
|
|
||||||
|
class SupercellWxConan(ConanFile):
|
||||||
|
settings = ("os", "compiler", "build_type", "arch")
|
||||||
|
requires = ("boost/1.81.0",
|
||||||
|
"cpr/1.9.3",
|
||||||
|
"freetype/2.12.1",
|
||||||
|
"geographiclib/1.52",
|
||||||
|
"glew/2.2.0",
|
||||||
|
"glm/cci.20220420",
|
||||||
|
"gtest/cci.20210126",
|
||||||
|
"libcurl/7.86.0",
|
||||||
|
"libxml2/2.10.3",
|
||||||
|
"openssl/3.1.0",
|
||||||
|
"spdlog/1.11.0",
|
||||||
|
"sqlite3/3.40.1",
|
||||||
|
"vulkan-loader/1.3.236.0",
|
||||||
|
"zlib/1.2.13")
|
||||||
|
generators = ("cmake",
|
||||||
|
"cmake_find_package",
|
||||||
|
"cmake_paths")
|
||||||
|
default_options = {"libiconv:shared" : True,
|
||||||
|
"openssl:no_module": True,
|
||||||
|
"openssl:shared" : True}
|
||||||
|
|
||||||
|
def requirements(self):
|
||||||
|
if self.settings.os == "Linux":
|
||||||
|
self.requires("onetbb/2021.9.0")
|
||||||
|
|
||||||
|
def imports(self):
|
||||||
|
self.copy("*.dll", dst="bin", src="bin")
|
||||||
|
self.copy("*.dylib", dst="bin", src="lib")
|
||||||
|
self.copy("license*", dst="licenses", src=".", folder=True, ignore_case=True)
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
[requires]
|
|
||||||
boost/1.81.0
|
|
||||||
cpr/1.9.3
|
|
||||||
freetype/2.12.1
|
|
||||||
geographiclib/1.52
|
|
||||||
glew/2.2.0
|
|
||||||
glm/cci.20220420
|
|
||||||
gtest/cci.20210126
|
|
||||||
libcurl/7.86.0
|
|
||||||
libxml2/2.10.3
|
|
||||||
openssl/3.1.0
|
|
||||||
spdlog/1.11.0
|
|
||||||
sqlite3/3.40.1
|
|
||||||
vulkan-loader/1.3.236.0
|
|
||||||
zlib/1.2.13
|
|
||||||
|
|
||||||
[generators]
|
|
||||||
cmake
|
|
||||||
cmake_find_package
|
|
||||||
cmake_paths
|
|
||||||
|
|
||||||
[options]
|
|
||||||
libiconv:shared=True
|
|
||||||
openssl:no_module=True
|
|
||||||
openssl:shared=True
|
|
||||||
|
|
||||||
[imports]
|
|
||||||
bin, *.dll -> ./bin
|
|
||||||
lib, *.dylib -> ./bin
|
|
||||||
., license* -> ./licenses @ folder=True, ignore_case=True
|
|
||||||
|
|
@ -7,6 +7,10 @@ find_package(cpr)
|
||||||
find_package(LibXml2)
|
find_package(LibXml2)
|
||||||
find_package(spdlog)
|
find_package(spdlog)
|
||||||
|
|
||||||
|
if (NOT MSVC)
|
||||||
|
find_package(TBB)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(HDR_AWIPS include/scwx/awips/coded_location.hpp
|
set(HDR_AWIPS include/scwx/awips/coded_location.hpp
|
||||||
include/scwx/awips/coded_time_motion_location.hpp
|
include/scwx/awips/coded_time_motion_location.hpp
|
||||||
include/scwx/awips/message.hpp
|
include/scwx/awips/message.hpp
|
||||||
|
|
@ -252,7 +256,8 @@ if (WIN32)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (NOT MSVC)
|
if (NOT MSVC)
|
||||||
target_link_libraries(wxdata PUBLIC date::date-tz)
|
target_link_libraries(wxdata PUBLIC date::date-tz
|
||||||
|
TBB::tbb)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set_target_properties(wxdata PROPERTIES CXX_STANDARD 20
|
set_target_properties(wxdata PROPERTIES CXX_STANDARD 20
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue