diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-04-03 12:26:38 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-04-05 03:23:13 +0200 |
| commit | eb32a2ac02c6d1adcfeb0a1a5522f8aaea442489 (patch) | |
| tree | b15b4ab34600e9c5d5da17eac33ea687167bbfc7 /cmake | |
| parent | 22a853b388597e9549125df69508c1c38706dd1d (diff) | |
i18n: provide for non-QObject classes
See compat/tr.hpp for comment.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-i18n.cmake | 1 | ||||
| -rw-r--r-- | cmake/opentrack-install.cmake | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cmake/opentrack-i18n.cmake b/cmake/opentrack-i18n.cmake index 34d1a3c3..4416a272 100644 --- a/cmake/opentrack-i18n.cmake +++ b/cmake/opentrack-i18n.cmake @@ -6,7 +6,6 @@ function(otr_i18n_for_target_directory n) foreach(i ${opentrack_all-translations}) set(t "${CMAKE_CURRENT_SOURCE_DIR}/lang/${i}.ts") set(t2 "${CMAKE_CURRENT_BINARY_DIR}/lang/${i}.ts") - set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY CLEAN_NO_CUSTOM 1) set(input ${${k}-cc} ${${k}-hh} ${${k}-ui} ${${k}-rc}) add_custom_command(OUTPUT "${t2}" COMMAND "${CMAKE_COMMAND}" -E make_directory "${CMAKE_CURRENT_SOURCE_DIR}/lang" diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 406a4dbb..074f6d97 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -35,6 +35,11 @@ function(install_sources) endif() endfunction() +function(cleanup_visual_studio_debug) + otr_escape_string(pfx "${CMAKE_INSTALL_PREFIX}") + install(CODE "file(REMOVE_RECURSE \"${pfx}/.vs\")") +endfunction() + otr_install_dir("${opentrack-doc-pfx}" ${CMAKE_SOURCE_DIR}/3rdparty-notices) otr_install_dir("${opentrack-doc-pfx}" "${CMAKE_SOURCE_DIR}/settings" "${CMAKE_SOURCE_DIR}/contrib") @@ -56,6 +61,10 @@ otr_install_misc("${opentrack-doc-src-pfx}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.m # this must be done last because the files may be in use already # do it last so in case of file-in-use failure, the rest is installed +if(MSVC AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + cleanup_visual_studio_debug() +endif() + otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" |