mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 06:49:56 +00:00
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
This commit is contained in:
parent
899fb06023
commit
4656a5e16a
@ -25,13 +25,18 @@
|
|||||||
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#
|
#
|
||||||
|
|
||||||
EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
|
EXECUTE_PROCESS(
|
||||||
${KDE_UIC_FILE}
|
COMMAND ${KDE_UIC_EXECUTABLE}
|
||||||
OUTPUT_VARIABLE _uic_CONTENTS
|
${KDE_UIC_FILE}
|
||||||
ERROR_QUIET
|
OUTPUT_VARIABLE _uic_CONTENTS
|
||||||
|
ERROR_QUIET
|
||||||
)
|
)
|
||||||
set(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE})
|
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")
|
FILE(WRITE ${KDE_UIC_CPP_FILE} "${_uic_CONTENTS}\n")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user