diff options
| author | Alexis Hildebrandt <afh@surryhill.net> | 2015-07-28 20:55:56 +0200 |
|---|---|---|
| committer | Alexis Hildebrandt <afh@surryhill.net> | 2015-07-28 20:55:56 +0200 |
| commit | d0fba947ade223dfa351c49ac15c6939c35b5f89 (patch) | |
| tree | 714ebd8340bc1ea687ec3e57c8b444816b1d48a7 | |
| parent | f5d59159f1aac6e5c24476d085de3f9033c52edb (diff) | |
| download | fork-ledger-d0fba947ade223dfa351c49ac15c6939c35b5f89.tar.gz fork-ledger-d0fba947ade223dfa351c49ac15c6939c35b5f89.tar.bz2 fork-ledger-d0fba947ade223dfa351c49ac15c6939c35b5f89.zip | |
[cmake] Use CMAKE_SYSTEM_NAME to test the platform.
APPLE and CMAKE_HOST_APPLE only check the host system,
whereas CMAKE_SYSTEM_NAME checks the target system when
cross-compiling.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6166780c..3c8c36ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -225,7 +225,7 @@ macro(add_ledger_library_dependencies _target) target_link_libraries(${_target} ${INTL_LIB}) endif() if (HAVE_BOOST_PYTHON) - if(APPLE) + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) # Don't link directly to a Python framework on OS X, to avoid segfaults # when the module is imported from a different interpreter target_link_libraries(${_target} ${Boost_LIBRARIES}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 570a6592..8ed6e51a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -273,7 +273,7 @@ if (BUILD_LIBRARY) add_executable(ledger main.cc global.cc) target_link_libraries(ledger libledger) - if (APPLE AND HAVE_BOOST_PYTHON) + if (CMAKE_SYSTEM_NAME STREQUAL Darwin AND HAVE_BOOST_PYTHON) target_link_libraries(ledger ${PYTHON_LIBRARIES}) endif() @@ -297,7 +297,7 @@ print(s.get_python_lib(True, prefix=''))" if (PYTHON_SITE_PACKAGES) if (WIN32 AND NOT CYGWIN) set(_ledger_python_module_name "ledger.pyd") - elseif(CMAKE_HOST_APPLE) + elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(_ledger_python_module_name "ledger.so") else() set(_ledger_python_module_name "ledger${CMAKE_SHARED_LIBRARY_SUFFIX}") |