Mercurial > hg > orthanc-postgresql
changeset 23:790dd02453a3
FreeBSD support
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 07 Apr 2015 16:44:46 +0200 |
| parents | 27ca1758df5e |
| children | 70ee605a7522 |
| files | CMakeLists.txt Core/PostgreSQLResult.cpp NEWS Resources/CMake/AutoGeneratedCode.cmake Resources/CMake/Compiler.cmake Resources/CMake/JsonCppConfiguration.cmake |
| diffstat | 6 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Apr 07 16:08:42 2015 +0200 +++ b/CMakeLists.txt Tue Apr 07 16:44:46 2015 +0200 @@ -40,6 +40,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/Core/PostgreSQLResult.cpp Tue Apr 07 16:08:42 2015 +0200 +++ b/Core/PostgreSQLResult.cpp Tue Apr 07 16:44:46 2015 +0200 @@ -30,6 +30,10 @@ #include <c.h> #include <catalog/pg_type.h> +#ifdef __FreeBSD__ +#include <arpa/inet.h> // ntohl() +#endif + namespace OrthancPlugins {
--- a/NEWS Tue Apr 07 16:08:42 2015 +0200 +++ b/NEWS Tue Apr 07 16:44:46 2015 +0200 @@ -1,7 +1,8 @@ Pending changes in the mainline =============================== -* Support for Visual Studio 2008 +* Support of Visual Studio 2008 +* Support of FreeBSD thanks Mikhail <mp39590@gmail.com> Release 1.0 (2015/02/27)
--- a/Resources/CMake/AutoGeneratedCode.cmake Tue Apr 07 16:08:42 2015 +0200 +++ b/Resources/CMake/AutoGeneratedCode.cmake Tue Apr 07 16:44:46 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/Compiler.cmake Tue Apr 07 16:08:42 2015 +0200 +++ b/Resources/CMake/Compiler.cmake Tue Apr 07 16:44:46 2015 +0200 @@ -32,6 +32,11 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc -static-libstdc++") endif() +elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + link_libraries(uuid) + link_directories("/usr/local/lib") + # This line helps CHECK_INCLUDE_FILE_CXX macro to find files + SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include") endif () if (CMAKE_COMPILER_IS_GNUCXX)
--- a/Resources/CMake/JsonCppConfiguration.cmake Tue Apr 07 16:08:42 2015 +0200 +++ b/Resources/CMake/JsonCppConfiguration.cmake Tue Apr 07 16:44:46 2015 +0200 @@ -41,7 +41,12 @@ 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()