onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2025-06-15 06:37:26 +02:00
Code Issues Releases Wiki Activity

chore: Update cmake for mxe-w32

Browse Source
This commit is contained in:
Sirius Bakke 2019-07-22 20:04:48 +00:00
parent 477101524a
commit 2502183c7e
4 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -76,7 +76,7 @@ if(APPLE)
elseif(WIN32)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
set(FWB_INSTALL_DATADIR release/resources)
set(FWB_INSTALL_DOCDIR release)
set(FWB_INSTALL_DOCDIR release/doc)
set(FWB_INSTALL_BINDIR release)
else()
include(GNUInstallDirs)

8
packaging/CMakeLists.txt
View File

@ -41,6 +41,14 @@ if(APPLE)
set(CPACK_DMG_FORMAT "UDBZ")
set(CPACK_DMG_VOLUME_NAME fwbuilder)
set(CPACK_PACKAGE_FILE_NAME fwbuilder-${PROJECT_VERSION})
elseif(WIN32)
configure_file(fwbuilder.nsi.in fwbuilder.nsi @ONLY)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/fwbuilder.nsi
fwbuilder-160x60.bmp
fwbuilder-164x314.bmp
DESTINATION ${CMAKE_INSTALL_PREFIX}/release)
endif()
include(CPack)

65
packaging/fwbuilder.nsi.in
View File

@ -11,12 +11,12 @@ Var STARTMENU_FOLDER
; GENERATION is used to build the path in the registry, it should be coordinated
; with the path defined in FWBSettings class
;
!define GENERATION "@GENERATION@"
!define VERSION "@VERSION@"
!define GENERATION "@PROJECT_GENERATION_SHORT@"
!define VERSION "@PROJECT_VERSION@"
!define APPNAME "FirewallBuilder-${GENERATION}"
!define APPNAME "FirewallBuilder-${VERSION}"
;------------------------------------------------------------------------------
; GetWindowsVersion
@ -137,7 +137,7 @@ FunctionEnd
setCompressor lzma
Name "Firewall Builder ${GENERATION}"
Name "Firewall Builder ${VERSION}"
Caption "Firewall Builder installation"
OutFile "fwbuilder-${VERSION}.exe"
@ -243,8 +243,6 @@ Section "FWBuilder (required)"
File "doc\README.nxosacl"
File "doc\README.junos"
File /oname=fwbuilder.ico "fwbuilder-windows.ico"
File /a "fwbuilder.exe"
File /a "fwbedit.exe"
File /a "fwb_iosacl.exe"
@ -259,31 +257,32 @@ Section "FWBuilder (required)"
; Install Qt and its dependencies
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Core.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Gui.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Network.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5PrintSupport.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Widgets.dll"
File /r "/usr/lib/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libbz2.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libgcc_s_sjlj-1.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libglib-2.0-0.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libharfbuzz-0.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libiconv-2.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libintl-8.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libpcre-1.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libpcre16-0.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libpcre2-16-0.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libpng16-16.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libstdc++-6.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libwinpthread-1.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libxml2-2.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libxslt-1.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/ssleay32.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/zlib1.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libeay32.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/libfreetype-6.dll"
File "/usr/lib/mxe/usr/i686-w64-mingw32.shared/bin/liblzma-5.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Core.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Gui.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Network.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5PrintSupport.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Widgets.dll"
File /r "/opt/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libbz2.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libgcc_s_sjlj-1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libglib-2.0-0.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libharfbuzz-0.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libiconv-2.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libintl-8.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libpcre-1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libpcre16-0.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libpcre2-16-0.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libpng16-16.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libstdc++-6.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libwinpthread-1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libxml2-2.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libxslt-1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/zlib1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libssl-1_1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libcrypto-1_1.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libfreetype-6.dll"
File "/opt/mxe/usr/i686-w64-mingw32.shared/bin/liblzma-5.dll"
File /nonfatal "/opt/mxe/usr/i686-w64-mingw32.shared/bin/libzstd.dll"
; Install RCS for these files
;
@ -304,7 +303,7 @@ Section "FWBuilder (required)"
WriteRegStr HKLM Software\NetCitadel\${APPNAME} "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "DisplayName" "Firewall Builder ${GENERATION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "DisplayName" "Firewall Builder ${VERSION}"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "Publisher" "https://github.com/fwbuilder"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\FWBuilder ${GENERATION}" "DisplayVersion" "${VERSION}"
@ -344,7 +343,7 @@ Section "FWBuilder (required)"
; SetShellVarContext all
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FWBuilder.lnk" "$INSTDIR\fwbuilder.exe" "" "$INSTDIR\fwbuilder.ico"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FWBuilder.lnk" "$INSTDIR\fwbuilder.exe" "" "$INSTDIR\fwbuilder.exe"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
!insertmacro MUI_STARTMENU_WRITE_END

3
src/gui/CMakeLists.txt
View File

@ -8,6 +8,9 @@ set(fwbuilder-gui_srcs
if(APPLE)
set_source_files_properties(${APP_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
add_executable(fwbuilder-gui MACOSX_BUNDLE ${fwbuilder-gui_srcs} ${APP_ICON_FILE})
elseif(WIN32)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mwindows")
add_executable(fwbuilder-gui ${fwbuilder-gui_srcs} fwbuilder-windows.rc)
else()
add_executable(fwbuilder-gui ${fwbuilder-gui_srcs})
endif()