Skip to content

Fix CMake on OSX 10.10 #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
certik merged 5 commits into from
May 15, 2015
Merged

Fix CMake on OSX 10.10 #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09ab7bc
CMake: update to 3.2.2
certik May 14, 2015
835f05b
CMake: use our zlib, bzip2 and curl
certik May 14, 2015
34c798a
CMake: set OSX specific variables properly
certik May 14, 2015
aa3c2f7
CMake: fix the $ORIGIN problem
certik May 14, 2015
9aed126
CMake: use our own expat library
certik May 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions base/cmake_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 27 additions & 3 deletions pkgs/cmake.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down