Merge pull request #828 from snikulov/cmake_rc_merge_fix

fixed cmake merge related to version.rc.in handling
This commit is contained in:
Richard Newton 2014-01-16 05:25:58 -08:00
commit 53d0199e50

View File

@ -420,10 +420,6 @@ foreach(source ${cxx-sources})
list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/src/${source})
endforeach()
foreach(source ${rc-sources})
list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/${source})
endforeach()
foreach(source ${rc-sources})
list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/${source})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/${source}.in ${CMAKE_CURRENT_BINARY_DIR}/${source})