From f8f710d9e27eb0649546af6d65069a82b61b6fc9 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Mon, 17 Oct 2016 01:17:48 +0200 Subject: [PATCH] Fix linker errors on Windows --- src/CMakeLists.txt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 89341cfa7..9a5aec83b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -272,15 +272,16 @@ if( NOT NO_OPENAL ) endif() endif() -set( LLVM_COMPONENTS core support asmparser asmprinter bitreader codegen ipo - irreader transformutils instrumentation profiledata runtimedyld - object instcombine linker analysis selectiondag scalaropts vectorize executionengine - mc mcdisassembler mcparser mcjit target x86asmprinter x86info x86desc x86utils x86codegen ) # Path where it looks for the LLVM compiled files on Windows set( LLVM_PRECOMPILED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../llvm" ) if( NOT WIN32 ) + set( LLVM_COMPONENTS core support asmparser asmprinter bitreader codegen ipo + irreader transformutils instrumentation profiledata runtimedyld + object instcombine linker analysis selectiondag scalaropts vectorize executionengine + mc mcdisassembler mcparser mcjit target x86asmprinter x86info x86desc x86utils x86codegen ) + # Example LLVM_DIR folder: C:/Development/Environment/Src/llvm-3.9.0/build/lib/cmake/llvm find_package(LLVM REQUIRED CONFIG) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") @@ -289,6 +290,11 @@ if( NOT WIN32 ) include_directories( ${LLVM_INCLUDE_DIRS} ) set( ZDOOM_LIBS ${ZDOOM_LIBS} ${llvm_libs} ) else() + set( LLVM_COMPONENTS core support asmparser asmprinter bitreader codegen passes ipo + irreader transformutils instrumentation profiledata debuginfocodeview runtimedyld + object instcombine linker analysis selectiondag scalaropts vectorize executionengine + mc mcdisassembler mcparser mcjit target x86asmprinter x86info x86desc x86utils x86codegen ) + include_directories( "${LLVM_PRECOMPILED_DIR}/include" ) if( X64 ) include_directories( "${LLVM_PRECOMPILED_DIR}/64bit-include" )