# HG changeset patch # User SokoL_SD # Date 1242656752 0 # Node ID 2bd596a4b984423aa658072c4a25e25a946ab43c # Parent cc557203146c50b1df619647077f117f873c6b17 CMake: qtd -> qt in install path of di files. diff -r cc557203146c -r 2bd596a4b984 CMakeLists.txt --- a/CMakeLists.txt Mon May 18 13:09:46 2009 +0000 +++ b/CMakeLists.txt Mon May 18 14:25:52 2009 +0000 @@ -399,7 +399,7 @@ if(NOT GENERATE_DI_FILES) get_filename_component(path ${d_source}.d PATH) get_filename_component(name ${d_source}.d NAME_WE) - install(FILES ${CMAKE_SOURCE_DIR}/qt/d${D_VERSION}/qt/${d_source}.d DESTINATION include/d/qtd/${path} RENAME ${name}.di) + install(FILES ${CMAKE_SOURCE_DIR}/qt/d${D_VERSION}/qt/${d_source}.d DESTINATION include/d/qt/${path} RENAME ${name}.di) endif(NOT GENERATE_DI_FILES) endforeach(d_source) foreach(d_source ${d_files}) @@ -407,7 +407,7 @@ if(NOT GENERATE_DI_FILES) get_filename_component(path ${d_source}.d PATH) get_filename_component(name ${d_source}.d NAME_WE) - install(FILES ${CMAKE_SOURCE_DIR}/qt/${d_source}.d DESTINATION include/d/qtd/${path} RENAME ${name}.di) + install(FILES ${CMAKE_SOURCE_DIR}/qt/${d_source}.d DESTINATION include/d/qt/${path} RENAME ${name}.di) endif(NOT GENERATE_DI_FILES) endforeach(d_source) foreach(d_source ${d_generated_files}) @@ -415,7 +415,7 @@ if(NOT GENERATE_DI_FILES) get_filename_component(path ${d_source}.d PATH) get_filename_component(name ${d_source}.d NAME_WE) - install(FILES ${CMAKE_BINARY_DIR}/qt/${d_source}.d DESTINATION include/d/qtd/${path} RENAME ${name}.di) + install(FILES ${CMAKE_BINARY_DIR}/qt/${d_source}.d DESTINATION include/d/qt/${path} RENAME ${name}.di) endif(NOT GENERATE_DI_FILES) endforeach(d_source) foreach (cpp_source ${cpp_files}) @@ -428,8 +428,8 @@ set(files_for_gen ${files_for_gen} ${CMAKE_BINARY_DIR}/cpp/qt_${package}/${class}_shell.cpp ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d) if(NOT GENERATE_DI_FILES) - install(FILES ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d DESTINATION include/d/qtd/${package} RENAME ${class}.di) - install(FILES ${CMAKE_BINARY_DIR}/qt/${package}/${class}_enum.d DESTINATION include/d/qtd/${package} RENAME ${class}_enum.di OPTIONAL) + install(FILES ${CMAKE_BINARY_DIR}/qt/${package}/${class}.d DESTINATION include/d/qt/${package} RENAME ${class}.di) + install(FILES ${CMAKE_BINARY_DIR}/qt/${package}/${class}_enum.d DESTINATION include/d/qt/${package} RENAME ${class}_enum.di OPTIONAL) endif(NOT GENERATE_DI_FILES) endforeach(class)