From 4656a5e16add6559475da82c3adf8a35addaaa6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Fri, 20 Oct 2006 11:28:45 +0000 Subject: [PATCH] fix wrong line endings of generated Qt4 ui files on Windows git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15398 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/modules/LyXuic.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/development/cmake/modules/LyXuic.cmake b/development/cmake/modules/LyXuic.cmake index f21aa17f53..b51b1eae64 100644 --- a/development/cmake/modules/LyXuic.cmake +++ b/development/cmake/modules/LyXuic.cmake @@ -25,13 +25,18 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -${KDE_UIC_FILE} -OUTPUT_VARIABLE _uic_CONTENTS -ERROR_QUIET +EXECUTE_PROCESS( + COMMAND ${KDE_UIC_EXECUTABLE} + ${KDE_UIC_FILE} + OUTPUT_VARIABLE _uic_CONTENTS + ERROR_QUIET ) set(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) +if(WIN32) + STRING(REGEX REPLACE "\r" "" _uic_CONTENTS "${_uic_CONTENTS}" ) +endif(WIN32) + FILE(WRITE ${KDE_UIC_CPP_FILE} "${_uic_CONTENTS}\n")