OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

CMake: Removed some cruft. 

llvm-svn: 58358
This commit is contained in:
Oscar Fuentes 2008-10-29 02:33:15 +00:00
parent 786ab2119f
commit 2500aaebdd
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/CMakeLists.txt
View File

@ -7,7 +7,7 @@ set(PACKAGE_BUGREPORT "llvmbugs@cs.uiuc.edu")
include(FindPerl) include(FindPerl)
set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include/llvm) set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include)
set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LLVM_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin) set(LLVM_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin)
set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples) set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
@ -21,14 +21,6 @@ else( MSVC )
CACHE STRING "Semicolon-separated list of targets to build") CACHE STRING "Semicolon-separated list of targets to build")
endif( MSVC ) endif( MSVC )
if( NOT MSVC )
set(CMAKE_CXX_LINK_EXECUTABLE "sh -c \"${CMAKE_CXX_LINK_EXECUTABLE}\"")
endif( NOT MSVC )
# TODO: Eliminate?
get_filename_component(llvm_include_path ${LLVM_MAIN_SRC_DIR}/include ABSOLUTE)
#get_filename_component(llvm_builded_incs_dir ${LLVM_BINARY_DIR}/include/llvm ABSOLUTE)
set(llvm_builded_incs_dir ${LLVM_BINARY_DIR}/include/llvm) set(llvm_builded_incs_dir ${LLVM_BINARY_DIR}/include/llvm)
# Add path for custom modules # Add path for custom modules
@ -83,7 +75,7 @@ if( MSVC )
add_definitions( -wd4355 -wd4715 ) add_definitions( -wd4355 -wd4715 )
endif( MSVC ) endif( MSVC )
include_directories( ${LLVM_BINARY_DIR}/include ${llvm_include_path}) include_directories( ${LLVM_BINARY_DIR}/include ${LLVM_MAIN_INCLUDE_DIR})
#link_directories( d:/dev/lib ) #link_directories( d:/dev/lib )
#add_subdirectory(lib) #add_subdirectory(lib)
@ -101,7 +93,7 @@ set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${LLVM_LIBS} )
add_subdirectory(utils/TableGen) add_subdirectory(utils/TableGen)
add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen add_custom_command(OUTPUT ${llvm_builded_incs_dir}/Intrinsics.gen
COMMAND tblgen -gen-intrinsic -I ${llvm_include_path} ${llvm_include_path}/llvm/Intrinsics.td -o ${llvm_builded_incs_dir}/Intrinsics.gen COMMAND tblgen -gen-intrinsic -I ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_MAIN_INCLUDE_DIR}/llvm/Intrinsics.td -o ${llvm_builded_incs_dir}/Intrinsics.gen
DEPENDS tblgen DEPENDS tblgen
COMMENT "Building intrinsics.gen...") COMMENT "Building intrinsics.gen...")

12
llvm/cmake/config-ix.cmake
View File

@ -57,9 +57,9 @@ get_target_triple(LLVM_HOSTTRIPLE)
message(STATUS "LLVM_HOSTTRIPLE: ${LLVM_HOSTTRIPLE}") message(STATUS "LLVM_HOSTTRIPLE: ${LLVM_HOSTTRIPLE}")
if( MINGW ) if( MINGW )
# tbi: Comprobar que existen las librerias:
set(HAVE_LIBIMAGEHLP 1) set(HAVE_LIBIMAGEHLP 1)
set(HAVE_LIBPSAPI 1) set(HAVE_LIBPSAPI 1)
# TODO: Check existence of libraries.
# include(CheckLibraryExists) # include(CheckLibraryExists)
# CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP) # CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP)
endif( MINGW ) endif( MINGW )
@ -97,26 +97,26 @@ set(RETSIGTYPE void)
set(ENABLE_THREADS 0) set(ENABLE_THREADS 0)
configure_file( configure_file(
${LLVM_MAIN_INCLUDE_DIR}/Config/config.h.cmake ${LLVM_MAIN_INCLUDE_DIR}/llvm/Config/config.h.cmake
${LLVM_BINARY_DIR}/include/llvm/Config/config.h ${LLVM_BINARY_DIR}/include/llvm/Config/config.h
) )
configure_file( configure_file(
${LLVM_MAIN_INCLUDE_DIR}/ADT/iterator.cmake ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/iterator.cmake
${LLVM_BINARY_DIR}/include/llvm/ADT/iterator.h ${LLVM_BINARY_DIR}/include/llvm/ADT/iterator.h
) )
configure_file( configure_file(
${LLVM_MAIN_INCLUDE_DIR}/Support/DataTypes.h.cmake ${LLVM_MAIN_INCLUDE_DIR}/llvm/Support/DataTypes.h.cmake
${LLVM_BINARY_DIR}/include/llvm/Support/DataTypes.h ${LLVM_BINARY_DIR}/include/llvm/Support/DataTypes.h
) )
configure_file( configure_file(
${LLVM_MAIN_INCLUDE_DIR}/ADT/hash_map.cmake ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/hash_map.cmake
${LLVM_BINARY_DIR}/include/llvm/ADT/hash_map.h ${LLVM_BINARY_DIR}/include/llvm/ADT/hash_map.h
) )
configure_file( configure_file(
${LLVM_MAIN_INCLUDE_DIR}/ADT/hash_set.cmake ${LLVM_MAIN_INCLUDE_DIR}/llvm/ADT/hash_set.cmake
${LLVM_BINARY_DIR}/include/llvm/ADT/hash_set.h ${LLVM_BINARY_DIR}/include/llvm/ADT/hash_set.h
) )

2
llvm/cmake/modules/TableGen.cmake
View File

@ -4,7 +4,7 @@
macro(tablegen ofn) macro(tablegen ofn)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn} add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${llvm_include_path} ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} -o ${ofn} COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} -o ${ofn}
DEPENDS tblgen ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} DEPENDS tblgen ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS}
COMMENT "Building ${ofn}..." COMMENT "Building ${ofn}..."
) )

6
llvm/tools/llvmc2/driver/CMakeLists.txt
View File

@ -3,11 +3,11 @@ set(LLVM_REQUIRES_EH 1)
macro(tgen ofn) macro(tgen ofn)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn} add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${llvm_include_path} ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td -o ${ofn} COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td -o ${ofn}
DEPENDS DEPENDS
tblgen tblgen
${llvm_include_path}/llvm/CompilerDriver/Common.td ${LLVM_MAIN_INCLUDE_DIR}/llvm/CompilerDriver/Common.td
${llvm_include_path}/llvm/CompilerDriver/Tools.td ${LLVM_MAIN_INCLUDE_DIR}/llvm/CompilerDriver/Tools.td
COMMENT "Building ${ofn}..." COMMENT "Building ${ofn}..."
) )
endmacro(tgen ofn) endmacro(tgen ofn)