OSDN Git Service

create resource paths only when they are needed
authorIvailo Monev <xakepa10@laimg.moc>
Wed, 21 Sep 2016 16:10:33 +0000 (16:10 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Wed, 21 Sep 2016 16:10:33 +0000 (16:10 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
cmake/modules/KatieBuildMacros.cmake
cmake/modules/KatieMacros.cmake

index ae8240c..1110529 100644 (file)
@@ -128,11 +128,11 @@ function(KATIE_SETUP_TARGET FORTARGET)
         get_filename_component(rscpath ${resource} PATH)
         get_source_file_property(skip ${resource} SKIP_RESOURCE)
         string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" rscpath "${rscpath}")
-        make_directory(${rscpath})
         if("${rscext}" STREQUAL ".ui")
             set(rscout "${rscpath}/ui_${rscname}.h")
             set(targetresources ${targetresources} ${rscout})
             if(NOT skip)
+                make_directory(${rscpath})
                 add_custom_command(
                     OUTPUT "${rscout}"
                     COMMAND "${KATIE_UIC}" "${resource}" -o "${rscout}"
@@ -142,6 +142,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
             set(rscout "${rscpath}/qrc_${rscname}.cpp")
             set(targetresources ${targetresources} ${rscout})
             if(NOT skip)
+                make_directory(${rscpath})
                 add_custom_command(
                     OUTPUT "${rscout}"
                     COMMAND "${KATIE_RCC}" "${resource}" -o "${rscout}" -name "${rscname}"
@@ -167,6 +168,7 @@ function(KATIE_SETUP_TARGET FORTARGET)
                 foreach(incdir ${dirincs})
                     set(mocargs ${mocargs} -I${incdir})
                 endforeach()
+                make_directory(${rscpath})
                 add_custom_command(
                     OUTPUT "${rscout}"
                     COMMAND "${KATIE_MOC}" -nw "${resource}" -o "${rscout}" ${mocargs}
index 740e84a..b073921 100644 (file)
@@ -10,9 +10,9 @@ macro(KATIE_RESOURCES RESOURCES)
             get_filename_component(rscname ${resource} NAME_WE)
             get_filename_component(rscpath ${resource} PATH)
             string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" rscpath "${rscpath}")
-            make_directory(${rscpath})
             if("${rscext}" STREQUAL ".ui")
                 set(rscout ${rscpath}/ui_${rscname}.h)
+                make_directory(${rscpath})
                 add_custom_command(
                     OUTPUT ${rscout}
                     COMMAND ${KATIE_UIC} "${resource}" -o "${rscout}"
@@ -20,6 +20,7 @@ macro(KATIE_RESOURCES RESOURCES)
                 )
             elseif("${rscext}" STREQUAL ".qrc")
                 set(rscout ${rscpath}/qrc_${rscname}.cpp)
+                make_directory(${rscpath})
                 add_custom_command(
                     OUTPUT ${rscout}
                     COMMAND ${KATIE_RCC} "${resource}" -o "${rscout}" -name "${rscname}"
@@ -41,6 +42,7 @@ macro(KATIE_RESOURCES RESOURCES)
                     foreach(incdir ${dirincs})
                         set(mocargs ${mocargs} -I${incdir})
                     endforeach()
+                    make_directory(${rscpath})
                     add_custom_command(
                         OUTPUT ${rscout}
                         COMMAND ${KATIE_MOC} -nw "${resource}" -o "${rscout}" ${mocargs}