fix pack

cginternals · Oct 17, 2018 · d4bd086 · d4bd086
1 parent f4fab4f
commit d4bd086
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/deploy/packages/pack-cppassist.cmake b/deploy/packages/pack-cppassist.cmake
@@ -130,7 +130,7 @@ set(CPACK_RESOURCE_FILE_LICENSE                "${PROJECT_SOURCE_DIR}/LICENSE")
 set(CPACK_RESOURCE_FILE_README                 "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_WELCOME                "${PROJECT_SOURCE_DIR}/README.md")
 set(CPACK_PACKAGE_DESCRIPTION_FILE             "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_PACKAGE_ICON                         "${PROJECT_SOURCE_DIR}/deploy/images/logo.bmp")
+# set(CPACK_PACKAGE_ICON                       "${PROJECT_SOURCE_DIR}/deploy/images/logo.bmp")
 set(CPACK_PACKAGE_FILE_NAME                    "${package_name}-${CPACK_PACKAGE_VERSION}")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY            "${package_name}")
 set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY         "${package_name}")
@@ -163,8 +163,8 @@ endif()
 
 # Package options
 #set(CPACK_NSIS_DISPLAY_NAME "${package_name}-${META_VERSION}")
-set(CPACK_NSIS_MUI_ICON      "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
-set(CPACK_NSIS_MUI_UNIICON   "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
+#set(CPACK_NSIS_MUI_ICON      "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
+#set(CPACK_NSIS_MUI_UNIICON   "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
 
 # Optional Preliminaries (i.e., silent Visual Studio Redistributable install)
 if(NOT INSTALL_MSVC_REDIST_FILEPATH)

diff --git a/source/cppassist/source/string/conversion.cpp b/source/cppassist/source/string/conversion.cpp
@@ -186,6 +186,8 @@ std::u32string encode(const std::wstring & input, const Encoding encoding)
     default:
         assert(false);
     }
+
+	return std::u32string();
 }
 
 std::u32string encode(const std::u16string & input, const Encoding encoding)