Skip to content

Commit

Permalink
cmake: build cef in jobserver mode
Browse files Browse the repository at this point in the history
fixes desura#415

also lower cmake version requiernemt to 2.8.2

NOTE: this is a candidate for the stable branches

v2: remove include of ProcessorCount
  • Loading branch information
karolherbst committed Mar 17, 2013
1 parent fa7dfd7 commit 0e7ee31
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ project(Desura)
if(APPLE) # see #418
cmake_minimum_required(VERSION 2.8.10)
else()
cmake_minimum_required(VERSION 2.8.5)
cmake_minimum_required(VERSION 2.8.2)
endif()

###############################################################################
Expand Down Expand Up @@ -107,7 +107,6 @@ include(macros)
include(parsearguments)
include(CheckCompiler)
include(SetInstallPaths)
include(ProcessorCount)
include(Package)
if(UNIX)
include(FindPkgConfig)
Expand Down
4 changes: 1 addition & 3 deletions cmake/modules/BuildCEF.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ if(BUILD_CEF OR BUILD_ONLY_CEF)
set(DEPOT_TOOLS_INSTALL_DIR ${CMAKE_EXTERNAL_BINARY_DIR}/depot_tools)
set(DEPOT_TOOLS_BIN_DIR ${DEPOT_TOOLS_INSTALL_DIR}/src/depot_tools)

ProcessorCount(CPU_COUNT)

ExternalProject_Add(
depot_tools
URL ${DEPOT_TOOLS_URL}
Expand Down Expand Up @@ -155,7 +153,7 @@ if(BUILD_CEF OR BUILD_ONLY_CEF)
ExternalProject_Add_Step(
cef
build_cef
COMMAND ${CMAKE_SCRIPT_PATH}/depot_tools_wrapper.sh ${DEPOT_TOOLS_BIN_DIR} ${MY_BUILD_TOOL} cef_desura V=1 -j${CPU_COUNT} $ENV{MAKEOPTS} CC.host=${CMAKE_C_COMPILER} CXX.host=${CMAKE_CXX_COMPILER} LINK.host=${CMAKE_CXX_COMPILER} AR.host=${CMAKE_AR} BUILDTYPE=Release
COMMAND ${CMAKE_SCRIPT_PATH}/depot_tools_wrapper.sh ${DEPOT_TOOLS_BIN_DIR} ${MY_BUILD_TOOL} cef_desura V=1 $ENV{MAKEOPTS} CC.host=${CMAKE_C_COMPILER} CXX.host=${CMAKE_CXX_COMPILER} LINK.host=${CMAKE_CXX_COMPILER} AR.host=${CMAKE_AR} BUILDTYPE=Release
DEPENDEES configure
DEPENDERS build
WORKING_DIRECTORY ${CHROMIUM_SOURCE_DIR}/src
Expand Down

0 comments on commit 0e7ee31

Please sign in to comment.