# HG changeset patch # User SokoL_SD # Date 1242413856 0 # Node ID a293cd68d56c4ffae73466419e270ac95ac93c8f # Parent eb2f212d17fe0462b634d305f4c34cb79ea7401d CMake: correctly fix of the regression on windows (rev. 34). diff -r eb2f212d17fe -r a293cd68d56c generator/CMakeLists.txt --- a/generator/CMakeLists.txt Fri May 15 18:39:24 2009 +0000 +++ b/generator/CMakeLists.txt Fri May 15 18:57:36 2009 +0000 @@ -259,26 +259,26 @@ # endforeach(dgen_impl ${files_for_gen}) add_custom_target(dgen COMMENT "") -macro(add_sources_for_generating) +macro(add_sources_for_generating) + set(parameters_list_file ${CMAKE_BINARY_DIR}/CMakeFiles/dgen_parameters) + if(${CMAKE_SYSTEM_NAME} STREQUAL Windows) + file(REMOVE ${parameters_list_file}) + foreach(arg ${ARGN}) + file(APPEND ${parameters_list_file} "${arg}\n") + endforeach(arg) + set(param @${parameters_list_file}) + elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux) + set(param ${parameters}) + endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows) foreach(dgen_impl ${ARGN}) - set(parameters ${GEN_OPT} --qt-include-directory=${QT_INCLUDE_DIR} --output-directory=${CMAKE_BINARY_DIR} + + add_custom_command(OUTPUT ${dgen_impl} + COMMAND ${CMAKE_COMMAND} -E remove -f ${param} + COMMAND "generator" + ARGS ${GEN_OPT} --qt-include-directory=${QT_INCLUDE_DIR} --output-directory=${CMAKE_BINARY_DIR} --source-directory=${CMAKE_SOURCE_DIR}/generator qtjambi_masterinclude.h - ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt) - set(parameters_list_file ${CMAKE_BINARY_DIR}/CMakeFiles/dgen_parameters) - if(${CMAKE_SYSTEM_NAME} STREQUAL Windows) - file(REMOVE ${parameters_list_file}) - foreach(arg ${parameters}) - file(APPEND ${parameters_list_file} "${arg}\n") - endforeach(arg) - set(param @${parameters_list_file}) - elseif(${CMAKE_SYSTEM_NAME} STREQUAL Linux) - set(param ${parameters}) - endif(${CMAKE_SYSTEM_NAME} STREQUAL Windows) - add_custom_command(OUTPUT ${dgen_impl} - COMMAND ${CMAKE_COMMAND} -E remove -f ${ARGN} - COMMAND "generator" - ARGS ${param} + ${CMAKE_BINARY_DIR}/CMakeFiles/build.txt COMMENT "Generating binding..." DEPENDS generator ${gen_typesystem} ${gen_sources} )