TGFS
/
TGC-ISS
15
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

adds llvm support

This commit is contained in:
Eyck Jentzsch 2023-07-17 19:57:24 +02:00
parent dd43191eb3
commit 02169317fd
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.cproject
View File

@ -48,7 +48,7 @@
<def name="CMAKE_BUILD_TYPE" type="STRING" val="${ConfigName}"/>
</defs>
</storageModule>
<storageModule buildDir="build/${ConfigName}" dirtyTs="1685097774834" moduleId="de.marw.cmake4eclipse.mbs.settings">
<storageModule buildDir="build/${ConfigName}" dirtyTs="1688934521924" moduleId="de.marw.cmake4eclipse.mbs.settings">
<options/>
<defs>
<def name="CMAKE_BUILD_TYPE" type="STRING" val="Debug"/>
@ -56,6 +56,7 @@
<def name="CODEGEN" type="BOOL" val="OFF"/>
<def name="CMAKE_INSTALL_PREFIX" type="FILEPATH" val="${ProjDirPath}/install"/>
<def name="WITH_TCC" type="BOOL" val="ON"/>
<def name="WITH_LLVM" type="BOOL" val="ON"/>
</defs>
</storageModule>
</cconfiguration>

17
CMakeLists.txt
View File

@ -67,6 +67,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
)
set(B2_VERSION 4.9.6)
set(CM_VERSION 3.20.5)
set(CONAN_PACKAGE_LIST
fmt/8.0.1
spdlog/1.9.2
@ -76,7 +77,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
lz4/1.9.3
yaml-cpp/0.7.0
jsoncpp/1.9.5
yaml-cpp/0.7.0
zlib/1.2.13
)
set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
@ -85,6 +86,11 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
set(WITH_TCC ON)
endif()
if(WITH_LLVM)
list(APPEND CONAN_PACKAGE_LIST llvm-core/13.0.0)
list(APPEND CONAN_PACKAGE_OPTIONS libiconv:shared=True)
endif()
if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False)
list(APPEND CONAN_PACKAGE_LIST lua/5.4.3)
@ -97,14 +103,21 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGFS-ISS")
# with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there
###########################################################################
set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
set(CM_META $ENV{HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
if(DEFINED ENV{CONAN_USER_HOME})
set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json)
set(CMAKE_META $ENV{CONAN_USER_HOME}/.conan/data/cmake/${CM_VERSION}/_/_/metadata.json)
endif()
if(NOT EXISTS ${B2_META})
conan_configure(REQUIRES b2/${B2_VERSION})
conan_cmake_autodetect(settings)
conan_cmake_autodetect(settings BUILD_TYPE Release)
conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings})
endif()
if(NOT EXISTS ${CM_META})
conan_configure(REQUIRES cmake/${CM_VERSION})
conan_cmake_autodetect(settings BUILD_TYPE Release)
conan_cmake_install(PATH_OR_REFERENCE . BUILD cmake SETTINGS ${settings})
endif()
###########################################################################
# Boost on CentOS 7 quirks end
###########################################################################

2
dbt-rise-core

@ -1 +1 @@
Subproject commit bb85be481cfd71c9fdaad5217a044b207465f4c4
Subproject commit 66ea45f1a539fc5772219c037d62a08aec5ce95c

2
dbt-rise-tgc

@ -1 +1 @@
Subproject commit 0b719a4b576a3ea1520193ab5a28442a939a5e4b
Subproject commit 94e46b996884f9836f8b2adbe13f7e5c2671faa6