YARN-3827. Migrate YARN native build to new CMake framework (Alan Burlison via Colin P. McCabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d0cc0380 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d0cc0380 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d0cc0380 Branch: refs/heads/HADOOP-12111 Commit: d0cc0380b57db5fdeb41775bb9ca42dac65928b8 Parents: 9c63825 Author: Colin Patrick Mccabe <[email protected]> Authored: Tue Jun 30 16:24:19 2015 -0700 Committer: Colin Patrick Mccabe <[email protected]> Committed: Tue Jun 30 16:24:19 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/CMakeLists.txt | 23 ++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d0cc0380/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 94bc8fc..5e9243d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -317,6 +317,9 @@ Release 2.8.0 - UNRELEASED YARN-3834. Scrub debug logging of tokens during resource localization. (Chris Nauroth via xgong) + YARN-3827. Migrate YARN native build to new CMake framework (Alan Burlison + via Colin P. McCabe) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/d0cc0380/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt index f691a9c..d4d6ae1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt @@ -16,25 +16,24 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR) -set(CMAKE_BUILD_TYPE, Release) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../../../../hadoop-common-project/hadoop-common) +include(HadoopCommon) -include(../../../../../hadoop-common-project/hadoop-common/src/JNIFlags.cmake NO_POLICY_SCOPE) +# Note: can't use -D_FILE_OFFSET_BITS=64, see MAPREDUCE-4258 +string(REPLACE "-D_FILE_OFFSET_BITS=64" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") +string(REPLACE "-D_FILE_OFFSET_BITS=64" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") include(CheckFunctionExists) -CHECK_FUNCTION_EXISTS(fcloseall HAVE_FCLOSEALL) +check_function_exists(fcloseall HAVE_FCLOSEALL) function(output_directory TGT DIR) - SET_TARGET_PROPERTIES(${TGT} PROPERTIES + set_target_properties(${TGT} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DIR}") - SET_TARGET_PROPERTIES(${TGT} PROPERTIES + set_target_properties(${TGT} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DIR}") - SET_TARGET_PROPERTIES(${TGT} PROPERTIES + set_target_properties(${TGT} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DIR}") -endfunction(output_directory TGT DIR) - -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -O2 -D_GNU_SOURCE") -# note: can't enable -D_LARGEFILE: see MAPREDUCE-4258 -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_REENTRANT") +endfunction() include_directories( ${CMAKE_CURRENT_SOURCE_DIR} @@ -42,7 +41,7 @@ include_directories( main/native/container-executor main/native/container-executor/impl ) -CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) +configure_file(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h) add_library(container main/native/container-executor/impl/configuration.c
