diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2018-05-25 23:42:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-25 23:42:41 +0300 |
| commit | 3cba9c5c1322888cc4e3bf5be76968fb82f6c8ae (patch) | |
| tree | fa7841496179637be2a46af2afbd41541137623e | |
| parent | 87167761ac467ce65b5cfd0a756b0c52d85ee160 (diff) | |
| parent | fe9ac8c52218120f6f637258897326838814dcb8 (diff) | |
Merge pull request #1645 from FreeRDP/bsd_intl
Moved intl linking for *BSD
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 07aaf8ebb..afae9652f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,12 +241,6 @@ if(GTK_FOUND) add_subdirectory(plugins/secret) endif() -find_package(Intl) -if(INTL_FOUND AND "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD|OpenBSD|NetBSD") - message(STATUS "${CMAKE_SYSTEM_NAME} detected, of type BSD, building with Intl") - include_directories(${Intl_INCLUDE_DIRS}) - target_link_libraries(remmina ${Intl_LIBRARIES}) -endif() if(WITH_TRANSLATIONS) add_subdirectory(po) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 20eeeb4d8..baf631645 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -132,6 +132,13 @@ target_link_libraries(remmina ${X11_LIBRARIES}) target_link_libraries(remmina ${CMAKE_THREAD_LIBS_INIT}) +find_package(Intl) +if(INTL_FOUND AND "${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD|OpenBSD|NetBSD") + message(STATUS "${CMAKE_SYSTEM_NAME} detected, building with Intl") + include_directories(${Intl_INCLUDE_DIRS}) + target_link_libraries(remmina ${Intl_LIBRARIES}) +endif() + find_suggested_package(LIBSSH) if(LIBSSH_FOUND) add_definitions(-DHAVE_LIBSSH) |