diff options
| author | Craig Earls <enderw88@gmail.com> | 2015-08-06 19:38:39 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2015-08-06 19:38:39 -0700 |
| commit | 0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c (patch) | |
| tree | fea3628fe67824069641f517a659cd88287ffdfc /CMakeLists.txt | |
| parent | 254d82e5eb123feaf87e3f7096a1f8389bac60b3 (diff) | |
| parent | 3c2d228ddc74b75122b07a87bbd06263092a9661 (diff) | |
| download | fork-ledger-0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c.tar.gz fork-ledger-0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c.tar.bz2 fork-ledger-0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c.zip | |
Merge commit '3c2d228ddc74b75122b07a87bbd06263092a9661' into next
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6166780c..e455ec02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,9 @@ set(Ledger_VERSION_PATCH 1) set(Ledger_VERSION_PRERELEASE "-alpha.1") set(Ledger_VERSION_DATE 20141005) +# Point CMake at any custom modules we may ship +list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") + enable_testing() add_definitions(-std=c++11) @@ -225,7 +228,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}) @@ -244,13 +247,20 @@ endmacro(add_ledger_library_dependencies _target) ######################################################################## +include(FindUtfcpp) +if (UTFCPP_FOUND) + include_directories("${UTFCPP_INCLUDE_DIR}") +else() + message(FATAL_ERROR "Missing required header file: utf8.h\n" + "Define UTFCPP_PATH or install utfcpp locally into the source tree below lib/utfcpp/." + ) +endif() + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) # add the binary tree to the search path for include files so that we will -# find TutorialConfig.h -include_directories("${PROJECT_SOURCE_DIR}/lib") -include_directories("${PROJECT_SOURCE_DIR}/lib/utfcpp/source") +# find system.hh include_directories("${PROJECT_BINARY_DIR}") configure_file( |