merge

win/packaging/create_msi.cmake.in

@@ -304,20 +304,24 @@ ENDFUNCTION()
 
 FUNCTION(TRAVERSE_DIRECTORIES dir topdir file prefix)
   FILE(RELATIVE_PATH rel ${topdir} ${dir})
-  IF(rel AND IS_DIRECTORY "${f}")
+  IF(rel)
+    IF (IS_DIRECTORY "${f}")
       MAKE_WIX_IDENTIFIER("${rel}" id)
       GET_FILENAME_COMPONENT(name ${dir} NAME)
       FILE(APPEND ${file} "${prefix}<Directory Id='D.${id}' Name='${name}'>\n")
     ENDIF()
+  ENDIF()
   FILE(GLOB all_files ${dir}/*)
     FOREACH(f ${all_files})
     IF(IS_DIRECTORY ${f})
       TRAVERSE_DIRECTORIES(${f} ${topdir} ${file} "${prefix}  ")
     ENDIF()
   ENDFOREACH()
-  IF(rel AND IS_DIRECTORY "${f}")
+  IF(rel)
+    IF(IS_DIRECTORY "${f}")
       FILE(APPEND ${file} "${prefix}</Directory>\n")
     ENDIF()
+  ENDIF()
 ENDFUNCTION()
 
 SET(CPACK_WIX_COMPONENTS)