From 84c2236f04a089d27b53041c9e1d89424d7eb700 Mon Sep 17 00:00:00 2001 From: Yuchen Deng Date: Thu, 27 Sep 2012 09:13:19 +0800 Subject: CMake: Change suffix from "cxx" to "cpp" for generate sources Cause Qt5's source file use "cpp" as suffix and automoc use "cpp" as suffix too. Keep it with same feel better. Change-Id: Iba3f8ffb5c3dbf003a9e1aacf3706089c1b6765c Reviewed-by: Stephen Kelly --- src/corelib/Qt5CoreMacros.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index c06c91324b..b0d9135010 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -150,7 +150,7 @@ function(QT5_WRAP_CPP outfiles ) set(moc_options ${_WRAP_CPP_OPTIONS}) foreach(it ${moc_files}) get_filename_component(it ${it} ABSOLUTE) - qt5_make_output_file(${it} moc_ cxx outfile) + qt5_make_output_file(${it} moc_ cpp outfile) qt5_create_moc_command(${it} ${outfile} "${moc_flags}" "${moc_options}") list(APPEND ${outfiles} ${outfile}) endforeach() @@ -175,7 +175,7 @@ function(QT5_ADD_RESOURCES outfiles ) get_filename_component(outfilename ${it} NAME_WE) get_filename_component(infile ${it} ABSOLUTE) get_filename_component(rc_path ${infile} PATH) - set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cxx) + set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) set(_RC_DEPENDS) if(EXISTS "${infile}") -- cgit v1.2.3