diff --git a/base/cmake_package.py b/base/cmake_package.py index ad83dfbfe..853c85b95 100644 --- a/base/cmake_package.py +++ b/base/cmake_package.py @@ -34,6 +34,9 @@ def configure(ctx, stage_args): else: conf_lines.append('-DCMAKE_BUILD_TYPE:STRING=Release') + if ctx.parameters['platform'] == 'Darwin': + conf_lines.append('-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=""') + #cmake needs to be given all the dependency dirs as prefix paths #so that we search the hashdist directories before the system directories #CMake doesn't use the CPPFLAGS implicitly to find libraries diff --git a/pkgs/cmake.yaml b/pkgs/cmake.yaml index 4da397372..01ae25dec 100644 --- a/pkgs/cmake.yaml +++ b/pkgs/cmake.yaml @@ -1,12 +1,36 @@ extends: [autotools_package] +dependencies: + build: [zlib, bzip2, curl, openssl, libidn, expat] + sources: -- key: tar.gz:kcrzjtzo7wnjfxkbctv6fgmurgmezzxg - url: http://www.cmake.org/files/v3.2/cmake-3.2.0-rc1.tar.gz +- key: tar.gz:vxuu43rwaodxivs7flwyqzsbkrbuit5x + url: http://www.cmake.org/files/v3.2/cmake-3.2.2.tar.gz build_stages: +- when: platform == 'Darwin' + name: fix_deployment_target + after: prologue + before: configure + handler: bash + bash: | + unset MACOSX_DEPLOYMENT_TARGET + - name: configure - extra: ['--parallel=${HASHDIST_CPU_COUNT}'] + extra: ['--parallel=${HASHDIST_CPU_COUNT}', + '--system-bzip2', + '--system-curl', + '--system-expat', + #'--system-jsoncpp', + #'--system-libarchive', + '--system-zlib', + '--', + '-DCMAKE_PREFIX_PATH=${CURL_DIR}/lib;${ZLIB_DIR}/lib;${BZIP2_DIR}/lib;${EXPAT_DIR}/lib', + '-DCURL_INCLUDE_DIR=${CURL_DIR}/include', + '-DZLIB_INCLUDE_DIR=${ZLIB_DIR}/include', + '-DBZIP2_INCLUDE_DIR=${BZIP2_DIR}/include', + '-DEXPAT_INCLUDE_DIR=${EXPAT_DIR}/include', + ] when_build_dependency: - set: CMAKE