[llvm-commits] [llvm] r58358 - in /llvm/trunk: CMakeLists.txt cmake/config-ix.cmake cmake/modules/TableGen.cmake tools/llvmc2/driver/CMakeLists.txt
Oscar Fuentes
ofv at wanadoo.es
Tue Oct 28 19:33:15 PDT 2008
Author: ofv
Date: Tue Oct 28 21:33:15 2008
New Revision: 58358
URL: http://llvm.org/viewvc/llvm-project?rev=58358&view=rev
Log:
CMake: Removed some cruft.
Modified:
llvm/trunk/CMakeLists.txt
llvm/trunk/cmake/config-ix.cmake
llvm/trunk/cmake/modules/TableGen.cmake
llvm/trunk/tools/llvmc2/driver/CMakeLists.txt
Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=58358&r1=58357&r2=58358&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Tue Oct 28 21:33:15 2008
@@ -7,7 +7,7 @@
include(FindPerl)
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_TOOLS_BINARY_DIR ${LLVM_BINARY_DIR}/bin)
set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
@@ -21,14 +21,6 @@
CACHE STRING "Semicolon-separated list of targets to build")
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)
# Add path for custom modules
@@ -83,7 +75,7 @@
add_definitions( -wd4355 -wd4715 )
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 )
#add_subdirectory(lib)
@@ -101,7 +93,7 @@
add_subdirectory(utils/TableGen)
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
COMMENT "Building intrinsics.gen...")
Modified: llvm/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/config-ix.cmake?rev=58358&r1=58357&r2=58358&view=diff
==============================================================================
--- llvm/trunk/cmake/config-ix.cmake (original)
+++ llvm/trunk/cmake/config-ix.cmake Tue Oct 28 21:33:15 2008
@@ -57,9 +57,9 @@
message(STATUS "LLVM_HOSTTRIPLE: ${LLVM_HOSTTRIPLE}")
if( MINGW )
- # tbi: Comprobar que existen las librerias:
set(HAVE_LIBIMAGEHLP 1)
set(HAVE_LIBPSAPI 1)
+ # TODO: Check existence of libraries.
# include(CheckLibraryExists)
# CHECK_LIBRARY_EXISTS(imagehlp ??? . HAVE_LIBIMAGEHLP)
endif( MINGW )
@@ -97,26 +97,26 @@
set(ENABLE_THREADS 0)
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
)
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
)
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
)
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
)
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
)
Modified: llvm/trunk/cmake/modules/TableGen.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=58358&r1=58357&r2=58358&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/TableGen.cmake (original)
+++ llvm/trunk/cmake/modules/TableGen.cmake Tue Oct 28 21:33:15 2008
@@ -4,7 +4,7 @@
macro(tablegen 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}
COMMENT "Building ${ofn}..."
)
Modified: llvm/trunk/tools/llvmc2/driver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc2/driver/CMakeLists.txt?rev=58358&r1=58357&r2=58358&view=diff
==============================================================================
--- llvm/trunk/tools/llvmc2/driver/CMakeLists.txt (original)
+++ llvm/trunk/tools/llvmc2/driver/CMakeLists.txt Tue Oct 28 21:33:15 2008
@@ -3,11 +3,11 @@
macro(tgen 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
tblgen
- ${llvm_include_path}/llvm/CompilerDriver/Common.td
- ${llvm_include_path}/llvm/CompilerDriver/Tools.td
+ ${LLVM_MAIN_INCLUDE_DIR}/llvm/CompilerDriver/Common.td
+ ${LLVM_MAIN_INCLUDE_DIR}/llvm/CompilerDriver/Tools.td
COMMENT "Building ${ofn}..."
)
endmacro(tgen ofn)
More information about the llvm-commits
mailing list