diff --git a/channels/rdpear/CMakeLists.txt b/channels/rdpear/CMakeLists.txt index 31f98cca8..8d0766200 100644 --- a/channels/rdpear/CMakeLists.txt +++ b/channels/rdpear/CMakeLists.txt @@ -35,4 +35,4 @@ if (NOT IOS AND NOT WIN32 AND NOT ANDROID) # add_channel_server(${MODULE_PREFIX} ${CHANNEL_NAME}) #endif() endif() -endif() \ No newline at end of file +endif() diff --git a/channels/rdpear/client/rdpear_main.c b/channels/rdpear/client/rdpear_main.c index a117740e6..97c45037a 100644 --- a/channels/rdpear/client/rdpear_main.c +++ b/channels/rdpear/client/rdpear_main.c @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include #include diff --git a/channels/rdpear/common/CMakeLists.txt b/channels/rdpear/common/CMakeLists.txt index 448fa9364..c6915d3d5 100644 --- a/channels/rdpear/common/CMakeLists.txt +++ b/channels/rdpear/common/CMakeLists.txt @@ -26,10 +26,25 @@ add_library(rdpear-common-obj OBJECT ) target_include_directories(rdpear-common - INTERFACE ${KRB5_INCLUDE_DIRS}) -target_include_directories(rdpear-common-obj - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${KRB5_INCLUDE_DIRS}) + SYSTEM + INTERFACE ${KRB5_INCLUDE_DIRS} +) +target_compile_options(rdpear-common + INTERFACE + ${KRB5_CFLAGS} +) +target_link_options(rdpear-common + INTERFACE + ${KRB5_LDFLAGS} +) +target_include_directories(rdpear-common-obj + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} +) +target_include_directories(rdpear-common-obj + SYSTEM + PRIVATE ${KRB5_INCLUDE_DIRS} +) target_link_directories(rdpear-common INTERFACE ${KRB5_LIBRARY_DIRS}) target_link_libraries(rdpear-common INTERFACE ${KRB5_LIBRARIES} diff --git a/cmake/FindKRB5.cmake b/cmake/FindKRB5.cmake index 5d5cde1cd..a9365e672 100644 --- a/cmake/FindKRB5.cmake +++ b/cmake/FindKRB5.cmake @@ -201,14 +201,14 @@ else() GET_KRB5_BY_CONFIG("${KRB5_ROOT_CONFIG}") endif() -#message("using KRB5_FOUND ${KRB5_FOUND} ") -#message("using KRB5_VERSION ${KRB5_VERSION} ") -#message("using KRB5_FLAVOUR ${KRB5_FLAVOUR} ") -#message("using KRB5_CFLAGS ${KRB5_CFLAGS} ") -#message("using KRB5_LDFLAGS ${KRB5_LDFLAGS} ") -#message("using KRB5_INCLUDEDIR ${KRB5_INCLUDEDIR} ") -#message("using KRB5_INCLUDE_DIRS ${KRB5_INCLUDEDIR} ") -#message("using KRB5_LIBRARIES ${KRB5_LIBRARIES} ") +message("using KRB5_FOUND ${KRB5_FOUND} ") +message("using KRB5_VERSION ${KRB5_VERSION} ") +message("using KRB5_FLAVOUR ${KRB5_FLAVOUR} ") +message("using KRB5_CFLAGS ${KRB5_CFLAGS} ") +message("using KRB5_LDFLAGS ${KRB5_LDFLAGS} ") +message("using KRB5_INCLUDEDIR ${KRB5_INCLUDEDIR} ") +message("using KRB5_INCLUDE_DIRS ${KRB5_INCLUDE_DIRS} ") +message("using KRB5_LIBRARIES ${KRB5_LIBRARIES} ") include(FindPackageHandleStandardArgs)