Mercurial > hg > orthanc-webviewer
changeset 17:b1eafe1e8511
FreeBSD
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 07 Apr 2015 16:45:45 +0200 |
parents | f926f0525b08 |
children | 54d5dd1df2e5 |
files | CMakeLists.txt Resources/CMake/AutoGeneratedCode.cmake Resources/CMake/JsonCppConfiguration.cmake |
diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Apr 07 16:08:05 2015 +0200 +++ b/CMakeLists.txt Tue Apr 07 16:45:45 2015 +0200 @@ -45,6 +45,7 @@ include(CheckIncludeFiles) include(CheckIncludeFileCXX) include(CheckLibraryExists) +include(FindPythonInterp) include(${CMAKE_SOURCE_DIR}/Resources/CMake/Compiler.cmake) include(${CMAKE_SOURCE_DIR}/Resources/CMake/AutoGeneratedCode.cmake) include(${CMAKE_SOURCE_DIR}/Resources/CMake/DownloadPackage.cmake)
--- a/Resources/CMake/AutoGeneratedCode.cmake Tue Apr 07 16:08:05 2015 +0200 +++ b/Resources/CMake/AutoGeneratedCode.cmake Tue Apr 07 16:45:45 2015 +0200 @@ -44,7 +44,7 @@ "${TARGET_BASE}.h" "${TARGET_BASE}.cpp" COMMAND - python + ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/Resources/EmbedResources.py" "${AUTOGENERATED_DIR}/EmbeddedResources" ${SCRIPT_ARGUMENTS}
--- a/Resources/CMake/JsonCppConfiguration.cmake Tue Apr 07 16:08:05 2015 +0200 +++ b/Resources/CMake/JsonCppConfiguration.cmake Tue Apr 07 16:45:45 2015 +0200 @@ -41,7 +41,13 @@ message(FATAL_ERROR "Please install the libjsoncpp-dev package") endif() - include_directories(/usr/include/jsoncpp) + find_path(JSONCPP_INCLUDE_DIR json/reader.h + /usr/include/jsoncpp + /usr/local/include/jsoncpp + ) + + message("JsonCpp include dir: ${JSONCPP_INCLUDE_DIR}") + include_directories(${JSONCPP_INCLUDE_DIR}) link_libraries(jsoncpp) endif()