Changeset 732

Show
Ignore:
Timestamp:
08/25/07 21:42:45 (12 months ago)
Author:
daelstorm
Message:

Cmake: run moc with no path; fix DATADIR again

Location:
museek+/trunk/sources
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • museek+/trunk/sources/CMakeLists.txt

    r729 r732  
    2222 
    2323IF (NOT DATADIR) 
    24   set(DATADIR ${CMAKE_INSTALL_PREFIX}/share/museek) 
     24  set(DATADIR ${CMAKE_INSTALL_PREFIX}/share) 
    2525ENDIF (NOT DATADIR) 
    2626 

  • museek+/trunk/sources/clean

    r730 r732  
    1414find ./ -name "Makefile"  -exec rm {} \; 
    1515rm system.h 
    16 rm -rf .sconf_temp/ 
    17 rm -f .sconsign*  
     16find ./ -name ".sconf_temp" -exec rm -r {} \; 
     17find ./ -name ".sconsign*" -exec rm -r {} \; 

  • museek+/trunk/sources/museeq/CMakeLists.txt

    r729 r732  
    2727 
    2828      ADD_CUSTOM_COMMAND(OUTPUT ${_moc} 
    29          COMMAND ${QT_MOC_EXECUTABLE} 
     29         COMMAND moc #${QT_MOC_EXECUTABLE}  
    3030         ARGS ${_tmp_FILE} -o ${_moc} 
    3131         DEPENDS ${_tmp_FILE} 
    … …  
    3636   ENDFOREACH (_current_FILE) 
    3737ENDMACRO(ADD_MOC_FILES) 
    38  
     38message(STATUS ${QT_MOC_EXECUTABLE}) 
    3939MACRO(ADD_TRANSLATION_FILES _sources ) 
    4040