Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3251 for code


Ignore:
Timestamp:
Jun 29, 2009, 6:13:26 PM (15 years ago)
Author:
rgrieder
Message:

Fixed two serious dependency bugs:

  • Only every second file of the tolua bind dependencies was regarded as such (already fixed in trunk)
  • Running cmake still caused complete rebuilds when using PCH
Location:
code
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core4/cmake/GenerateToluaBindings.cmake

    r3196 r3251  
    5353  ENDIF()
    5454
    55   # Create temporary package file
     55  # Create temporary package file and implicit dependencies
    5656  FILE(REMOVE ${_tolua_pkgfile})
    5757  FOREACH(_tolua_inputfile ${_tolua_inputfiles})
    5858    FILE(APPEND ${_tolua_pkgfile} "\$cfile \"${_tolua_inputfile}\"\n")
     59    LIST(APPEND _implicit_dependencies CXX ${_tolua_inputfile})
    5960  ENDFOREACH(_tolua_inputfile)
    6061
    … …  
    6768                               -s ${TOLUA_PARSER_SOURCE}
    6869                                  ${_tolua_pkgfile}
    69     DEPENDS              ${TOLUA_PARSER_DEPENDENCIES}
    70     IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
    71     WORKING_DIRECTORY    ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
     70    DEPENDS           ${TOLUA_PARSER_DEPENDENCIES}
     71    IMPLICIT_DEPENDS  ${_implicit_dependencies}
     72    WORKING_DIRECTORY ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
    7273    COMMENT "Generating tolua bind files for package ${_tolua_package}"
    7374  )

  • code/branches/core4/cmake/PrecompiledHeaderFiles.cmake

    r3228 r3251  
    110110    GET_GCC_COMPILER_FLAGS(${_target_name} _pch_gcc_flags)
    111111    # Make sure we recompile the pch file even if only the flags change
    112     IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_PCH_GCC_FLAGS}")
    113       SET(_INTERNAL_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
     112    IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_${_target_name}_PCH_GCC_FLAGS}")
     113      SET(_INTERNAL_${_target_name}_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
    114114      FILE(WRITE ${_pch_dep_helper_file} "/* ${_pch_gcc_flags} */")
    115115    ENDIF()

  • code/branches/netp6/cmake/GenerateToluaBindings.cmake

    r3196 r3251  
    5353  ENDIF()
    5454
    55   # Create temporary package file
     55  # Create temporary package file and implicit dependencies
    5656  FILE(REMOVE ${_tolua_pkgfile})
    5757  FOREACH(_tolua_inputfile ${_tolua_inputfiles})
    5858    FILE(APPEND ${_tolua_pkgfile} "\$cfile \"${_tolua_inputfile}\"\n")
     59    LIST(APPEND _implicit_dependencies CXX ${_tolua_inputfile})
    5960  ENDFOREACH(_tolua_inputfile)
    6061
    … …  
    6768                               -s ${TOLUA_PARSER_SOURCE}
    6869                                  ${_tolua_pkgfile}
    69     DEPENDS              ${TOLUA_PARSER_DEPENDENCIES}
    70     IMPLICIT_DEPENDS CXX ${_tolua_inputfiles}
    71     WORKING_DIRECTORY    ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
     70    DEPENDS           ${TOLUA_PARSER_DEPENDENCIES}
     71    IMPLICIT_DEPENDS  ${_implicit_dependencies}
     72    WORKING_DIRECTORY ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
    7273    COMMENT "Generating tolua bind files for package ${_tolua_package}"
    7374  )

  • code/branches/netp6/cmake/PrecompiledHeaderFiles.cmake

    r3229 r3251  
    110110    GET_GCC_COMPILER_FLAGS(${_target_name} _pch_gcc_flags)
    111111    # Make sure we recompile the pch file even if only the flags change
    112     IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_PCH_GCC_FLAGS}")
    113       SET(_INTERNAL_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
     112    IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_${_target_name}_PCH_GCC_FLAGS}")
     113      SET(_INTERNAL_${_target_name}_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
    114114      FILE(WRITE ${_pch_dep_helper_file} "/* ${_pch_gcc_flags} */")
    115115    ENDIF()

  • code/trunk/cmake/PrecompiledHeaderFiles.cmake

    r3196 r3251  
    110110    GET_GCC_COMPILER_FLAGS(${_target_name} _pch_gcc_flags)
    111111    # Make sure we recompile the pch file even if only the flags change
    112     IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_PCH_GCC_FLAGS}")
    113       SET(_INTERNAL_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
     112    IF(NOT "${_pch_gcc_flags}" STREQUAL "${_INTERNAL_${_target_name}_PCH_GCC_FLAGS}")
     113      SET(_INTERNAL_${_target_name}_PCH_GCC_FLAGS "${_pch_gcc_flags}" CACHE INTERNAL "")
    114114      FILE(WRITE ${_pch_dep_helper_file} "/* ${_pch_gcc_flags} */")
    115115    ENDIF()
    … …  
    153153        ARGS ${pchsupport_compiler_cxx_arg1} ${_pch_gcc_flags} -c -x c++-header -o ${_pch_file} ${_pch_header_file}
    154154        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
    155         DEPENDS ${_pch_header_file} ${_pch_dep_helper_file}
    156         IMPLICIT_DEPENDS ${_pch_header_file}
     155        DEPENDS ${_pch_dep_helper_file}
     156        IMPLICIT_DEPENDS CXX ${_pch_header_file}
    157157        VERBATIM
    158158      )
Note: See TracChangeset for help on using the changeset viewer.