Loading CMakeLists.txt +2 −0 Changes for CMakeLists.txt: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -9,6 +9,8 @@ set(PLUGINPATH "${CMAKE_INSTALL_PREFIX}/lib/authdb" CACHE FILEPATH "default plug add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${DATAPATH}" -DPLUGINPATH="${PLUGINPATH}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") message(STATUS "System: ${CMAKE_HOST_SYSTEM_NAME}") if( NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows" ) Loading cmake/FindcJSON.cmake 0 → 100644 +57 −0 Changes for cmake/FindcJSON.cmake: 57 added lines, 0 removed lines. Original line number Diff line number Diff line # FindcJSON.cmake - Find cJSON using pkg-config # Bypasses broken system cJSONConfig.cmake that requires missing static lib include(FindPackageHandleStandardArgs) find_package(PkgConfig QUIET) if(PkgConfig_FOUND) pkg_check_modules(PC_CJSON QUIET libcjson) endif() find_path(CJSON_INCLUDE_DIR NAMES cjson/cJSON.h cJSON.h HINTS ${PC_CJSON_INCLUDE_DIRS} PATH_SUFFIXES include ) find_library(CJSON_LIBRARY NAMES cjson HINTS ${PC_CJSON_LIBRARY_DIRS} ) find_package_handle_standard_args(cJSON FOUND_VAR CJSON_FOUND REQUIRED_VARS CJSON_INCLUDE_DIR CJSON_LIBRARY VERSION_VAR PC_CJSON_VERSION FAIL_MESSAGE "Could NOT find cJSON library or headers." ) if(CJSON_FOUND AND NOT TARGET cjson) add_library(cjson SHARED IMPORTED) set_target_properties(cjson PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CJSON_INCLUDE_DIR}" ) if(WIN32) set_target_properties(cjson PROPERTIES IMPORTED_IMPLIB "${CJSON_LIBRARY}" ) get_filename_component(_CJSON_LIB_DIR "${CJSON_LIBRARY}" DIRECTORY) get_filename_component(_CJSON_PARENT_DIR "${_CJSON_LIB_DIR}" DIRECTORY) get_filename_component(_CJSON_LIB_NAME_WE "${CJSON_LIBRARY}" NAME_WE) string(REGEX REPLACE "^lib" "" _CJSON_DLL_BASE "${_CJSON_LIB_NAME_WE}") set_target_properties(cjson PROPERTIES IMPORTED_LOCATION_RELEASE "${_CJSON_PARENT_DIR}/bin/${_CJSON_DLL_BASE}.dll" IMPORTED_LOCATION_DEBUG "${_CJSON_PARENT_DIR}/bin/${_CJSON_DLL_BASE}d.dll" IMPORTED_LOCATION_RELWITHDEBINFO "${_CJSON_PARENT_DIR}/bin/${_CJSON_DLL_BASE}.dll" ) else() set_target_properties(cjson PROPERTIES IMPORTED_LOCATION "${CJSON_LIBRARY}" ) endif() endif() mark_as_advanced(CJSON_INCLUDE_DIR CJSON_LIBRARY) Loading
CMakeLists.txt +2 −0 Changes for CMakeLists.txt: 2 added lines, 0 removed lines. Original line number Diff line number Diff line Loading @@ -9,6 +9,8 @@ set(PLUGINPATH "${CMAKE_INSTALL_PREFIX}/lib/authdb" CACHE FILEPATH "default plug add_definitions(-D${CMAKE_HOST_SYSTEM_NAME} -DDATAPATH="${DATAPATH}" -DPLUGINPATH="${PLUGINPATH}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") message(STATUS "System: ${CMAKE_HOST_SYSTEM_NAME}") if( NOT ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows" ) Loading
cmake/FindcJSON.cmake 0 → 100644 +57 −0 Changes for cmake/FindcJSON.cmake: 57 added lines, 0 removed lines. Original line number Diff line number Diff line # FindcJSON.cmake - Find cJSON using pkg-config # Bypasses broken system cJSONConfig.cmake that requires missing static lib include(FindPackageHandleStandardArgs) find_package(PkgConfig QUIET) if(PkgConfig_FOUND) pkg_check_modules(PC_CJSON QUIET libcjson) endif() find_path(CJSON_INCLUDE_DIR NAMES cjson/cJSON.h cJSON.h HINTS ${PC_CJSON_INCLUDE_DIRS} PATH_SUFFIXES include ) find_library(CJSON_LIBRARY NAMES cjson HINTS ${PC_CJSON_LIBRARY_DIRS} ) find_package_handle_standard_args(cJSON FOUND_VAR CJSON_FOUND REQUIRED_VARS CJSON_INCLUDE_DIR CJSON_LIBRARY VERSION_VAR PC_CJSON_VERSION FAIL_MESSAGE "Could NOT find cJSON library or headers." ) if(CJSON_FOUND AND NOT TARGET cjson) add_library(cjson SHARED IMPORTED) set_target_properties(cjson PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CJSON_INCLUDE_DIR}" ) if(WIN32) set_target_properties(cjson PROPERTIES IMPORTED_IMPLIB "${CJSON_LIBRARY}" ) get_filename_component(_CJSON_LIB_DIR "${CJSON_LIBRARY}" DIRECTORY) get_filename_component(_CJSON_PARENT_DIR "${_CJSON_LIB_DIR}" DIRECTORY) get_filename_component(_CJSON_LIB_NAME_WE "${CJSON_LIBRARY}" NAME_WE) string(REGEX REPLACE "^lib" "" _CJSON_DLL_BASE "${_CJSON_LIB_NAME_WE}") set_target_properties(cjson PROPERTIES IMPORTED_LOCATION_RELEASE "${_CJSON_PARENT_DIR}/bin/${_CJSON_DLL_BASE}.dll" IMPORTED_LOCATION_DEBUG "${_CJSON_PARENT_DIR}/bin/${_CJSON_DLL_BASE}d.dll" IMPORTED_LOCATION_RELWITHDEBINFO "${_CJSON_PARENT_DIR}/bin/${_CJSON_DLL_BASE}.dll" ) else() set_target_properties(cjson PROPERTIES IMPORTED_LOCATION "${CJSON_LIBRARY}" ) endif() endif() mark_as_advanced(CJSON_INCLUDE_DIR CJSON_LIBRARY)