Skip to content

Commit

Permalink
Fixed some packaging issues
Browse files Browse the repository at this point in the history
  • Loading branch information
bigfug committed Feb 27, 2024
1 parent dce9a51 commit c027a59
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 24 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ add_subdirectory( fugio-plugin-manager )

#------------------------------------------------------------------------------

install( DIRECTORY include/ DESTINATION ${PATH_INCLUDE}
PATTERN ".*" EXCLUDE
)
# install( DIRECTORY include/ DESTINATION ${PATH_INCLUDE}
# PATTERN ".*" EXCLUDE
# )

install( DIRECTORY share/ DESTINATION ${PATH_SHARE}
PATTERN ".*" EXCLUDE
Expand All @@ -117,8 +117,8 @@ if( OPENSSL_FOUND )
message( "OpenSSL: ${OPENSSL_VERSION}" )

install( FILES
${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll
${OPENSSL_ROOT_DIR}/bin/libssl-1_1-x64.dll
${OPENSSL_ROOT_DIR}/bin/libcrypto-3-x64.dll
${OPENSSL_ROOT_DIR}/bin/libssl-3-x64.dll
DESTINATION ${PATH_APP} )
endif()

Expand Down
2 changes: 1 addition & 1 deletion FugioApp/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ int main( int argc, char *argv[] )
}
else if( MsgBox.clickedButton() == buttonYes )
{
PluginActionDownload BootstrapDown( QUrl( "https://raw.githubusercontent.com/bigfug/Fugio/develop/fugio-bootstrap.json" ) );
PluginActionDownload BootstrapDown( QUrl( "https://raw.githubusercontent.com/bigfug/Fugio/bootstrap/fugio-bootstrap.json" ) );

BootstrapDown.setAutoRemove( true );

Expand Down
28 changes: 11 additions & 17 deletions cmake/DeployApp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ if( WIN32 AND CMAKE_BUILD_TYPE STREQUAL Release )
COMMAND "${WINDEPLOYQT_EXECUTABLE}"
--verbose 2
--no-compiler-runtime
--no-angle
--no-opengl-sw
--concurrent --opengl --serialport --websockets --network --qml --quick --quickwidgets
--dir "${ABS_BINARY_DIR}/${PATH_APP}"
Expand All @@ -80,7 +79,6 @@ if( WIN32 AND CMAKE_BUILD_TYPE STREQUAL Release )
COMMAND \"${WINDEPLOYQT_EXECUTABLE}\"
--dry-run
--no-compiler-runtime
--no-angle
--no-opengl-sw
--list mapping
--concurrent --opengl --serialport --websockets --network --qml --quick --quickwidgets
Expand All @@ -92,27 +90,23 @@ if( WIN32 AND CMAKE_BUILD_TYPE STREQUAL Release )
OUTPUT_STRIP_TRAILING_WHITESPACE
)
separate_arguments(_files WINDOWS_COMMAND \${_output})
separate_arguments(_files WINDOWS_COMMAND \${_output})
while(_files)
list(GET _files 0 _src)
while(_files)
list(GET _files 0 _src)
if( EXISTS \${_src} )
list(GET _files 1 _dest)
message( \${_src} )
message( \"Copying \${_src}\" )
execute_process(
COMMAND \"${CMAKE_COMMAND}\" -E
copy \${_src} \"\${CMAKE_INSTALL_PREFIX}/${PATH_APP}/\${_dest}\"
)
separate_arguments(_files WINDOWS_COMMAND \${_output})
while(_files)
list(GET _files 0 _src)
list(GET _files 1 _dest)
execute_process(
COMMAND \"${CMAKE_COMMAND}\" -E
copy \${_src} \"\${CMAKE_INSTALL_PREFIX}/${PATH_APP}/\${_dest}\"
)
list(REMOVE_AT _files 0 1)
endwhile()
endwhile()
list(REMOVE_AT _files 0 1)
else()
list(REMOVE_AT _files 0)
endif()
endwhile()
"
)

Expand Down
2 changes: 1 addition & 1 deletion fugio-bootstrap.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"repositories": [
"https://github.com/bigfug/fugio-core-plugins/releases/download/latest/fugio-manifest.json",
"https://github.com/bigfug/fugio-core-plugins/releases/download/v1.0.0/fugio-manifest.json",
"https://github.com/bigfug/fugio-portaudio/releases/download/v1.0.0/fugio-manifest.json"
],
"plugins": [
Expand Down

0 comments on commit c027a59

Please sign in to comment.