Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(527)

Side by Side Diff: tools/llvm-config/CMakeLists.txt

Issue 1196003003: Make `llvm-config` detect whether or not LLVM is a shared library. If it is, then only try to link … (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-llvm.git@master
Patch Set: Review changes. Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tools/llvm-config/BuildVariables.inc.in ('k') | tools/llvm-config/Makefile » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 set(LLVM_LINK_COMPONENTS support) 1 set(LLVM_LINK_COMPONENTS support)
2 2
3 set(BUILDVARIABLES_SRCPATH ${CMAKE_CURRENT_SOURCE_DIR}/BuildVariables.inc.in) 3 set(BUILDVARIABLES_SRCPATH ${CMAKE_CURRENT_SOURCE_DIR}/BuildVariables.inc.in)
4 set(BUILDVARIABLES_OBJPATH ${CMAKE_CURRENT_BINARY_DIR}/BuildVariables.inc) 4 set(BUILDVARIABLES_OBJPATH ${CMAKE_CURRENT_BINARY_DIR}/BuildVariables.inc)
5 5
6 # Compute the substitution values for various items. 6 # Compute the substitution values for various items.
7 get_property(LLVM_SYSTEM_LIBS_LIST TARGET LLVMSupport PROPERTY LLVM_SYSTEM_LIBS) 7 get_property(LLVM_SYSTEM_LIBS_LIST TARGET LLVMSupport PROPERTY LLVM_SYSTEM_LIBS)
8 foreach(l ${LLVM_SYSTEM_LIBS_LIST}) 8 foreach(l ${LLVM_SYSTEM_LIBS_LIST})
9 set(SYSTEM_LIBS ${SYSTEM_LIBS} "-l${l}") 9 set(SYSTEM_LIBS ${SYSTEM_LIBS} "-l${l}")
10 endforeach() 10 endforeach()
11 string(REPLACE ";" " " SYSTEM_LIBS "${SYSTEM_LIBS}") 11 string(REPLACE ";" " " SYSTEM_LIBS "${SYSTEM_LIBS}")
12 12
13 # Use configure_file to create BuildVariables.inc. 13 # Use configure_file to create BuildVariables.inc.
14 set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR}) 14 set(LLVM_SRC_ROOT ${LLVM_MAIN_SRC_DIR})
15 set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR}) 15 set(LLVM_OBJ_ROOT ${LLVM_BINARY_DIR})
16 set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ TYPE}} ${LLVM_DEFINITIONS}") 16 set(LLVM_CPPFLAGS "${CMAKE_CPP_FLAGS} ${CMAKE_CPP_FLAGS_${uppercase_CMAKE_BUILD_ TYPE}} ${LLVM_DEFINITIONS}")
17 set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}") 17 set(LLVM_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${uppercase_CMAKE_BUILD_TYPE}} ${LLVM_DEFINITIONS}")
18 set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_ TYPE}} ${LLVM_DEFINITIONS}") 18 set(LLVM_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_ TYPE}} ${LLVM_DEFINITIONS}")
19 # Use the C++ link flags, since they should be a superset of C link flags. 19 # Use the C++ link flags, since they should be a superset of C link flags.
20 set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}") 20 set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
21 set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE}) 21 set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
22 set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS}) 22 set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
23 set(WAS_BUILT_WITH_CMAKE "ON")
23 string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}") 24 string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}")
24 configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY) 25 configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY)
25 26
26 # Set build-time environment(s). 27 # Set build-time environment(s).
27 add_definitions(-DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}") 28 add_definitions(-DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}")
28 29
29 # Add the llvm-config tool. 30 # Add the llvm-config tool.
30 add_llvm_tool(llvm-config 31 add_llvm_tool(llvm-config
31 llvm-config.cpp 32 llvm-config.cpp
32 ) 33 )
33 34
34 # Add the dependency on the generation step. 35 # Add the dependency on the generation step.
35 add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABL ES_OBJPATH}) 36 add_file_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/llvm-config.cpp ${BUILDVARIABL ES_OBJPATH})
36 37
37 if(CMAKE_CROSSCOMPILING) 38 if(CMAKE_CROSSCOMPILING)
38 set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config") 39 set(${project}_LLVM_CONFIG_EXE "${LLVM_NATIVE_BUILD}/bin/llvm-config")
39 set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE) 40 set(${project}_LLVM_CONFIG_EXE ${${project}_LLVM_CONFIG_EXE} PARENT_SCOPE)
40 41
41 add_custom_command(OUTPUT "${${project}_LLVM_CONFIG_EXE}" 42 add_custom_command(OUTPUT "${${project}_LLVM_CONFIG_EXE}"
42 COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIGURA TION> 43 COMMAND ${CMAKE_COMMAND} --build . --target llvm-config --config $<CONFIGURA TION>
43 DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt 44 DEPENDS ${LLVM_NATIVE_BUILD}/CMakeCache.txt
44 WORKING_DIRECTORY ${LLVM_NATIVE_BUILD} 45 WORKING_DIRECTORY ${LLVM_NATIVE_BUILD}
45 COMMENT "Building native llvm-config...") 46 COMMENT "Building native llvm-config...")
46 add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_ EXE}) 47 add_custom_target(${project}NativeLLVMConfig DEPENDS ${${project}_LLVM_CONFIG_ EXE})
47 add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE) 48 add_dependencies(${project}NativeLLVMConfig CONFIGURE_LLVM_NATIVE)
48 49
49 add_dependencies(llvm-config ${project}NativeLLVMConfig) 50 add_dependencies(llvm-config ${project}NativeLLVMConfig)
50 endif(CMAKE_CROSSCOMPILING) 51 endif(CMAKE_CROSSCOMPILING)
OLDNEW
« no previous file with comments | « tools/llvm-config/BuildVariables.inc.in ('k') | tools/llvm-config/Makefile » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698