mirror of
https://github.com/beefytech/Beef.git
synced 2025-06-10 20:42:21 +02:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
Brian Fiete
commit
45f2d0e33c
8 changed files with 137 additions and 110 deletions
|
|
@ -36,6 +36,12 @@ add_definitions(
|
|||
set (CMAKE_CXX_STANDARD 11)
|
||||
#add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
|
||||
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
CHECK_INCLUDE_FILES(backtrace.h HAVE_BACKTRACE_HEADERS)
|
||||
if (HAVE_BACKTRACE_HEADERS)
|
||||
add_definitions(-DBFP_HAS_BACKTRACE)
|
||||
endif ()
|
||||
|
||||
if (${APPLE})
|
||||
include_directories(
|
||||
.
|
||||
|
|
@ -116,10 +122,7 @@ if(MSVC)
|
|||
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W3 /GL /Od /Oi /Gy /EHsc")
|
||||
endif(MSVC)
|
||||
if(NOT MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof")
|
||||
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
|
||||
#set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
|
||||
endif()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-rtti -Wno-multichar -Wno-invalid-offsetof")
|
||||
endif(NOT MSVC)
|
||||
|
||||
################ Files ################
|
||||
|
|
@ -182,10 +185,83 @@ add_library(${PROJECT_NAME} SHARED
|
|||
${SRC_FILES}
|
||||
)
|
||||
|
||||
if (${APPLE})
|
||||
set(TARGET_LIBS_OS "ncurses")
|
||||
execute_process(
|
||||
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../extern/llvm_linux_8_0_0/bin/llvm-config --system-libs --link-static
|
||||
OUTPUT_VARIABLE LLVM_SYSTEM_LIBS
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
|
||||
set(TARGET_LIBS_OS "${LLVM_SYSTEM_LIBS}")
|
||||
|
||||
if (HAVE_BACKTRACE_HEADERS)
|
||||
set(TARGET_LIBS_OS " -lbacktrace")
|
||||
endif()
|
||||
|
||||
list(APPEND LLVM_LIBS
|
||||
${LLVM_LIB}/libLLVMCore.a
|
||||
${LLVM_LIB}/libLLVMMC.a
|
||||
${LLVM_LIB}/libLLVMMCParser.a
|
||||
${LLVM_LIB}/libLLVMCodeGen.a
|
||||
${LLVM_LIB}/libLLVMMCDisassembler.a
|
||||
${LLVM_LIB}/libLLVMObject.a
|
||||
${LLVM_LIB}/libLLVMBitReader.a
|
||||
${LLVM_LIB}/libLLVMAsmParser.a
|
||||
${LLVM_LIB}/libLLVMTarget.a
|
||||
${LLVM_LIB}/libLLVMScalarOpts.a
|
||||
${LLVM_LIB}/libLLVMInstCombine.a
|
||||
${LLVM_LIB}/libLLVMSelectionDAG.a
|
||||
${LLVM_LIB}/libLLVMProfileData.a
|
||||
${LLVM_LIB}/libLLVMTransformUtils.a
|
||||
${LLVM_LIB}/libLLVMAnalysis.a
|
||||
${LLVM_LIB}/libLLVMAsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMBitWriter.a
|
||||
${LLVM_LIB}/libLLVMVectorize.a
|
||||
${LLVM_LIB}/libLLVMipo.a
|
||||
${LLVM_LIB}/libLLVMInstrumentation.a
|
||||
${LLVM_LIB}/libLLVMDebugInfoDWARF.a
|
||||
${LLVM_LIB}/libLLVMDebugInfoPDB.a
|
||||
${LLVM_LIB}/libLLVMDebugInfoCodeView.a
|
||||
${LLVM_LIB}/libLLVMGlobalISel.a
|
||||
${LLVM_LIB}/libLLVMBinaryFormat.a
|
||||
${LLVM_LIB}/libLLVMIRReader.a
|
||||
${LLVM_LIB}/libLLVMLinker.a
|
||||
${LLVM_LIB}/libLLVMAggressiveInstCombine.a
|
||||
|
||||
${LLVM_LIB}/libLLVMX86Info.a
|
||||
${LLVM_LIB}/libLLVMX86Utils.a
|
||||
${LLVM_LIB}/libLLVMX86AsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMX86Desc.a
|
||||
${LLVM_LIB}/libLLVMX86CodeGen.a
|
||||
${LLVM_LIB}/libLLVMX86AsmParser.a
|
||||
${LLVM_LIB}/libLLVMX86Disassembler.a
|
||||
|
||||
${LLVM_LIB}/libLLVMARMInfo.a
|
||||
${LLVM_LIB}/libLLVMARMUtils.a
|
||||
${LLVM_LIB}/libLLVMARMAsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMARMDesc.a
|
||||
${LLVM_LIB}/libLLVMARMCodeGen.a
|
||||
${LLVM_LIB}/libLLVMARMAsmParser.a
|
||||
${LLVM_LIB}/libLLVMARMDisassembler.a
|
||||
|
||||
${LLVM_LIB}/libLLVMAArch64Info.a
|
||||
${LLVM_LIB}/libLLVMAArch64Utils.a
|
||||
${LLVM_LIB}/libLLVMAArch64AsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMAArch64Desc.a
|
||||
${LLVM_LIB}/libLLVMAArch64CodeGen.a
|
||||
${LLVM_LIB}/libLLVMAArch64AsmParser.a
|
||||
${LLVM_LIB}/libLLVMAArch64Disassembler.a
|
||||
|
||||
${LLVM_LIB}/libLLVMSupport.a
|
||||
${LLVM_LIB}/libLLVMDemangle.a)
|
||||
|
||||
FOREACH (lib ${LLVM_LIBS})
|
||||
string(APPEND TARGET_LIBS_OS " " ${lib})
|
||||
ENDFOREACH()
|
||||
|
||||
if (CMAKE_BUILD_TYPE STREQUAL "Debug" )
|
||||
FILE(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/../IDE/dist/IDEHelper_libs_d.txt" ${TARGET_LIBS_OS})
|
||||
else()
|
||||
#set(TARGET_LIBS_OS "backtrace")
|
||||
FILE(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/../IDE/dist/IDEHelper_libs.txt" ${TARGET_LIBS_OS})
|
||||
endif()
|
||||
|
||||
# Link with other dependencies.
|
||||
|
|
@ -193,60 +269,6 @@ if(MSVC)
|
|||
target_link_libraries(${PROJECT_NAME} BeefySysLib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LLVMX86Disassembler.lib LLVMMCDisassembler.lib LLVMSupport.lib LLVMX86Info.lib LLVMX86Utils.lib LLVMX86AsmPrinter.lib LLVMX86Desc.lib %(AdditionalDependencies) LLVMMC.lib LLVMObject.lib LLVMCore.lib LLVMBitReader.lib LLVMAsmParser.lib LLVMMCParser.lib LLVMCodeGen.lib LLVMTarget.lib LLVMX86CodeGen.lib LLVMScalarOpts.lib LLVMInstCombine.lib LLVMSelectionDAG.lib LLVMProfileData.lib LLVMTransformUtils.lib LLVMAnalysis.lib LLVMX86AsmParser.lib LLVMAsmPrinter.lib LLVMBitWriter.lib LLVMVectorize.lib LLVMipo.lib LLVMInstrumentation.lib LLVMDebugInfoDWARF.lib LLVMDebugInfoPDB.lib LLVMDebugInfoCodeView.lib LLVMGlobalISel.lib LLVMBinaryFormat.lib LLVMAggressiveInstCombine.lib libcurl_a.lib)
|
||||
else()
|
||||
target_link_libraries(${PROJECT_NAME} BeefySysLib hunspell pthread dl ${TARGET_LIBS_OS}
|
||||
${LLVM_LIB}/libLLVMCore.a
|
||||
${LLVM_LIB}/libLLVMMC.a
|
||||
${LLVM_LIB}/libLLVMMCParser.a
|
||||
${LLVM_LIB}/libLLVMCodeGen.a
|
||||
${LLVM_LIB}/libLLVMMCDisassembler.a
|
||||
${LLVM_LIB}/libLLVMObject.a
|
||||
${LLVM_LIB}/libLLVMBitReader.a
|
||||
${LLVM_LIB}/libLLVMAsmParser.a
|
||||
${LLVM_LIB}/libLLVMTarget.a
|
||||
${LLVM_LIB}/libLLVMScalarOpts.a
|
||||
${LLVM_LIB}/libLLVMInstCombine.a
|
||||
${LLVM_LIB}/libLLVMSelectionDAG.a
|
||||
${LLVM_LIB}/libLLVMProfileData.a
|
||||
${LLVM_LIB}/libLLVMTransformUtils.a
|
||||
${LLVM_LIB}/libLLVMAnalysis.a
|
||||
${LLVM_LIB}/libLLVMAsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMBitWriter.a
|
||||
${LLVM_LIB}/libLLVMVectorize.a
|
||||
${LLVM_LIB}/libLLVMipo.a
|
||||
${LLVM_LIB}/libLLVMInstrumentation.a
|
||||
${LLVM_LIB}/libLLVMDebugInfoDWARF.a
|
||||
${LLVM_LIB}/libLLVMDebugInfoPDB.a
|
||||
${LLVM_LIB}/libLLVMDebugInfoCodeView.a
|
||||
${LLVM_LIB}/libLLVMGlobalISel.a
|
||||
${LLVM_LIB}/libLLVMBinaryFormat.a
|
||||
${LLVM_LIB}/libLLVMIRReader.a
|
||||
${LLVM_LIB}/libLLVMLinker.a
|
||||
${LLVM_LIB}/libLLVMAggressiveInstCombine.a
|
||||
|
||||
${LLVM_LIB}/libLLVMX86Info.a
|
||||
${LLVM_LIB}/libLLVMX86Utils.a
|
||||
${LLVM_LIB}/libLLVMX86AsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMX86Desc.a
|
||||
${LLVM_LIB}/libLLVMX86CodeGen.a
|
||||
${LLVM_LIB}/libLLVMX86AsmParser.a
|
||||
${LLVM_LIB}/libLLVMX86Disassembler.a
|
||||
|
||||
${LLVM_LIB}/libLLVMARMInfo.a
|
||||
${LLVM_LIB}/libLLVMARMUtils.a
|
||||
${LLVM_LIB}/libLLVMARMAsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMARMDesc.a
|
||||
${LLVM_LIB}/libLLVMARMCodeGen.a
|
||||
${LLVM_LIB}/libLLVMARMAsmParser.a
|
||||
${LLVM_LIB}/libLLVMARMDisassembler.a
|
||||
|
||||
${LLVM_LIB}/libLLVMAArch64Info.a
|
||||
${LLVM_LIB}/libLLVMAArch64Utils.a
|
||||
${LLVM_LIB}/libLLVMAArch64AsmPrinter.a
|
||||
${LLVM_LIB}/libLLVMAArch64Desc.a
|
||||
${LLVM_LIB}/libLLVMAArch64CodeGen.a
|
||||
${LLVM_LIB}/libLLVMAArch64AsmParser.a
|
||||
${LLVM_LIB}/libLLVMAArch64Disassembler.a
|
||||
|
||||
${LLVM_LIB}/libLLVMSupport.a
|
||||
${LLVM_LIB}/libLLVMDemangle.a
|
||||
|
||||
)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue