Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR for cmake deb fix (#1783) #1787

Merged
merged 7 commits into from
Dec 4, 2024
Merged

PR for cmake deb fix (#1783) #1787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
168de88
Initial work toward fixing https://github.com/McStasMcXtrace/McCode/i…
willend Dec 3, 2024
9b97c24
Follow-up with recommends for comps package
willend Dec 3, 2024
af6f978
Finalize most work for https://github.com/McStasMcXtrace/McCode/issue…
willend Dec 3, 2024
3f93d7b
fixup meta-packages
willend Dec 3, 2024
b15050f
Use 10 threads in make
Dec 3, 2024
0a12a79
Reorder CMakeLists to correctly pick up DEBIAN clauses>
Dec 3, 2024
ab3df08
Centralize use of MCCODE_MAJOR/MINOR/PATCH in the cmake/Modules
Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildscripts/build_debs_mcstas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ rm -rf build
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DMCPL_ENABLE_CPACK=ON
make
make -j10
cpack -G DEB .
DEB=`ls *.deb`
DEBNAME=`echo $DEB | sed s/Linux/$MCCODE_ARCH/g`
Expand All @@ -77,7 +77,7 @@ rm -rf build
mkdir build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DNCRYSTAL_ENABLE_CPACK=ON
make
make -j10
cpack -G DEB .
DEB=`ls *.deb`
DEBNAME=`echo $DEB | sed s/Linux/$MCCODE_ARCH/g`
Expand Down
24 changes: 14 additions & 10 deletions cmake/Modules/InstallMCCODE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,27 @@ macro(installMCCODE)
endif()

## CPack configuration
set(CPACK_PACKAGE_NAME "${FLAVOR}-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}")
set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

## Package versioning
set(MAJOR "1")
set(MINOR "0")

set(CPACK_PACKAGE_VERSION "${MAJOR}.${MINOR}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MINOR}")
# Split incoming MCCODE_VERSION to list
string(REPLACE "." ";" MCCODE_VERSION_LIST ${MCCODE_VERSION})

## Package versioning
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)

set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")
## Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "build-essential, libopenmpi-dev, bash")
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "${FLAVOR}-comps-${MCCODE_VERSION}")
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${FLAVOR}-2.1rc1")
set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "${FLAVOR}-comps")
set(CPACK_DEBIAN_PACKAGE_SUGGESTS "")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-3.5.1")

## FreeBSD
set(CPACK_FREEBSD_PACKAGE_LICENSE "GPLv3")
Expand Down
15 changes: 14 additions & 1 deletion cmake/Modules/MCUtil.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,27 @@ macro(setupMCCODE FLAVOR)
if (MCVERSION)
set(MCCODE_VERSION "${MCVERSION}")
else ()
set(MCCODE_VERSION "3.9999-git")
set(MCCODE_VERSION "3.999.999-git")
endif()
set(MCCODE_NAME "${FLAVOR}")
set(MCCODE_DATE "git")
set(MCCODE_STRING "${NAME} ${MCCODE_VERSION}, ${MCCODE_DATE}")
set(MCCODE_TARNAME "${FLAVOR}")
endif()

# Split incoming MCCODE_VERSION to list
string(REPLACE "." ";" MCCODE_VERSION_LIST ${MCCODE_VERSION})

## Package versioning
list(GET MCCODE_VERSION_LIST 0 MCCODE_MAJOR)
list(GET MCCODE_VERSION_LIST 1 MCCODE_MINOR)
list(GET MCCODE_VERSION_LIST 2 MCCODE_PATCH)

set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")

include(Locations)
# During migration set these as well:
set( bin "${DEST_BINDIR}" )
Expand Down
12 changes: 7 additions & 5 deletions doc/manuals/mcstas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ message( "setup MCCODE" )
setupMCCODE("${FLAVOR}")
# CPack configuration
message( "CPack configuration" )
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "1.0")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")

# NSIS
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
Expand All @@ -46,7 +47,8 @@ endif()


# Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")

include(CPack)

Expand Down
13 changes: 7 additions & 6 deletions doc/manuals/mcxtrace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ setupMCCODE("${FLAVOR}")

# CPack configuration
message( "CPack configuration" )
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "1.0")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")

# NSIS
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
Expand All @@ -48,8 +49,8 @@ endif()


# Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")

set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")
include(CPack)

message( "LaTeX configuration" )
Expand Down
12 changes: 7 additions & 5 deletions docpkg/manuals/mcstas/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ setupMCCODE("${FLAVOR}")

# CPack configuration
message( "CPack configuration" )
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "1.0")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")

# NSIS
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
Expand All @@ -39,7 +40,8 @@ set(MCCODE_LIB "${DEST_DATADIR_COMPS}")
set(MANDEST "${DEST_DATADIR_DOC}")

# Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")

include(CPack)

Expand Down
12 changes: 7 additions & 5 deletions docpkg/manuals/mcxtrace/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ setupMCCODE("${FLAVOR}")

# CPack configuration
message( "CPack configuration" )
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-manuals")
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/../COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "1.0")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")

# NSIS
set(NSIS_NAME "Manuals, ${MCCODE_VERSION}")
Expand All @@ -39,7 +40,8 @@ set(MCCODE_LIB "${DEST_DATADIR_COMPS}")
set(MANDEST "${DEST_DATADIR_DOC}")

# Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-manuals-3.5.1")

include(CPack)

Expand Down
29 changes: 17 additions & 12 deletions mcstas-comps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,36 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
include(MCUtil)
setupMCCODE("mcstas")

option( ENABLE_CIF2HKL "Build Third Party code cif2hkl (fortran)" ON )#TODO: Only enable enable Fortran if this is on
if ( ENABLE_CIF2HKL )
set(DEBIDEPS "${FLAVOR}, libnexus-dev, libgsl-dev")
else()
set(DEBIDEPS "${FLAVOR}, libnexus-dev, libgsl-dev, cif2hkl")
endif()

set(WORK "${PROJECT_BINARY_DIR}/work")

# CPack configuration
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps")
set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "1.0")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")


set(CPACK_DEBIAN_PACKAGE_DEPENDS "${DEBIDEPS}")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-comps-3.5.1")


# NSIS
set(CPACK_NSIS_PACKAGE_NAME "${MCCODE_STRING} Components")
set(CPACK_NSIS_DISPLAY_NAME "${MCCODE_STRING} Components")

include(CPack)

option( ENABLE_CIF2HKL "Build Third Party code cif2hkl (fortran)" ON )#TODO: Only enable enable Fortran if this is on
if ( ENABLE_CIF2HKL )
enable_language( Fortran )
add_executable(
Expand All @@ -41,13 +53,6 @@ if ( ENABLE_CIF2HKL )
)
endif()

# Debian
if ( ENABLE_CIF2HKL )
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libgsl-dev")
else()
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libgsl-dev, cif2hkl")
endif()

option( ENABLE_NEUTRONICS "Build Third Party code neutronics (fortran)" ON )#TODO: Only enable enable Fortran if this is on
if ( ENABLE_NEUTRONICS )
enable_language( Fortran )
Expand Down
14 changes: 8 additions & 6 deletions mcxtrace-comps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ setupMCCODE("mcxtrace")
set(WORK "${PROJECT_BINARY_DIR}/work")

# CPack configuration
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-comps")
set(CPACK_RESOURCE_FilE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "1.0")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")


# NSIS
Expand All @@ -44,10 +45,11 @@ endif()

# Debian
if ( ENABLE_CIF2HKL )
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libxrl-dev, libgsl-dev")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, libnexus-dev, libxrl-dev, libgsl-dev")
else()
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, libnexus-dev, libxrl-dev, libgsl-dev, cif2hkl")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, libnexus-dev, libxrl-dev, libgsl-dev, cif2hkl")
endif()
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-comps-3.5.1")

# System c-code
install( DIRECTORY "share/" DESTINATION "${DEST_DATADIR_CODEFILES}")
Expand Down
4 changes: 2 additions & 2 deletions meta-pkgs/deb/control.mcstas-suite-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: @VERSION@
Section: main
Priority: optional
Architecture: all
Depends: mcstas-@VERSION@, mcstas-comps-@VERSION@, mcstas-tools-python-mcplot-pyqtgraph-@VERSION@, mcstas-tools-python-mcplot-matplotlib-@VERSION@, mcstas-tools-python-mcrun-@VERSION@, mcstas-tools-python-mcgui-@VERSION@, mcstas-tools-python-mccodelib-@VERSION@, mcstas-tools-python-mcdisplay-webgl-@VERSION@, mcstas-tools-python-mcdisplay-pyqtgraph-@VERSION@, mcstas-tools-python-mcdisplay-mantid-@VERSION@, mcstas-manuals-@VERSION@, mcstas-tools-python-mcdoc-@VERSION@, mcpl, ncrystal
Depends: mcstas, mcstas-comps, mcstas-tools-python-mcplot-pyqtgraph, mcstas-tools-python-mcplot-matplotlib, mcstas-tools-python-mcrun, mcstas-tools-python-mcgui, mcstas-tools-python-mccodelib, mcstas-tools-python-mcdisplay-webgl, mcstas-tools-python-mcdisplay-pyqtgraph, mcstas-tools-python-mcdisplay-mantid, mcstas-manuals, mcstas-tools-python-mcdoc, mcpl, ncrystal
Installed-Size:
Maintainer: Peter Willendrup
Maintainer: Peter Willendrup <[email protected]>
Description: A metapackage for McStas + python tools
2 changes: 1 addition & 1 deletion meta-pkgs/deb/control.mcstas-suite-python-ng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Priority: optional
Architecture: all
Depends: mcstas-suite-python
Installed-Size:
Maintainer: Peter Willendrup
Maintainer: Peter Willendrup <[email protected]>
Description: A metapackage for McStas + python tools
4 changes: 2 additions & 2 deletions meta-pkgs/deb/control.mcxtrace-suite-python
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Version: @VERSION@
Section: main
Priority: optional
Architecture: all
Depends: mcxtrace-@VERSION@, mcxtrace-comps-@VERSION@, mcxtrace-tools-python-mxplot-pyqtgraph-@VERSION@, mcxtrace-tools-python-mxplot-matplotlib-@VERSION@, mcxtrace-tools-python-mxdisplay-pyqtgraph-@VERSION@, mcxtrace-tools-python-mxdisplay-webgl-@VERSION@, mcxtrace-tools-python-mxrun-@VERSION@, mcxtrace-tools-python-mxdoc-@VERSION@, mcxtrace-tools-python-mccodelib-@VERSION@, mcxtrace-tools-python-mxgui-@VERSION@, mcxtrace-manuals-@VERSION@, mcpl
Depends: mcxtrace, mcxtrace-comps, mcxtrace-tools-python-mxplot-pyqtgraph, mcxtrace-tools-python-mxplot-matplotlib, mcxtrace-tools-python-mxdisplay-pyqtgraph, mcxtrace-tools-python-mxdisplay-webgl, mcxtrace-tools-python-mxrun, mcxtrace-tools-python-mxdoc, mcxtrace-tools-python-mccodelib, mcxtrace-tools-python-mxgui, mcxtrace-manuals, mcpl
Installed-Size:
Maintainer: Erik B Knudsen <erkn@fysik.dtu.dk>
Maintainer: Peter Willendrup <pkwi@fysik.dtu.dk>
Description: A metapackage for McXtrace + python tools
2 changes: 1 addition & 1 deletion meta-pkgs/deb/control.mcxtrace-suite-python-ng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ Priority: optional
Architecture: all
Depends: mcxtrace-suite-python
Installed-Size:
Maintainer: Erik B Knudsen <erkn@fysik.dtu.dk>
Maintainer: Peter Willendrup <pkwi@fysik.dtu.dk>
Description: A metapackage for McXtrace + python tools
12 changes: 7 additions & 5 deletions tools/Python/mccodelib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,14 @@ else()
endif()

# CPack configuration
set(CPACK_PACKAGE_NAME "${FLAVOR}-tools-python-mccodelib-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-tools-python-mccodelib")
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "${MCCODE_VERSION}")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")
set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")


# NSIS
Expand All @@ -69,7 +70,8 @@ set(CPACK_NSIS_DISPLAY_NAME "${NSIS_NAME}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${NSIS_NAME}")

# Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, python3, python3-ply, hdf-compass")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, python3, python3-ply, hdf-compass")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-tools-python-mccodelib-3.5.1")

# RPM
if (RPMPROFILE)
Expand Down
14 changes: 7 additions & 7 deletions tools/Python/mcdisplay/cad/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ set(P "${MCCODE_PREFIX}")
set(TOOLS_NAME "Python/${P}display/cad")

# CPack configuration
set(CPACK_PACKAGE_NAME "${FLAVOR}-tools-python-${P}display-cad-${MCCODE_VERSION}")
set(CPACK_PACKAGE_NAME "${FLAVOR}-tools-python-${P}display-cad")
set(CPACK_RESOURCE_FilE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
set(CPACK_PACKAGE_CONTACT "[email protected]")

set(CPACK_PACKAGE_VERSION "${MCCODE_VERSION}")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "0")

set(CPACK_PACKAGE_VERSION "${MCCODE_MAJOR}.${MCCODE_MINOR}.${MCCODE_PATCH}")
set(CPACK_PACKAGE_VERSION_MAJOR "${MCCODE_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${MCCODE_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${MCCODE_PATCH}")

# NSIS
set(NSIS_NAME "Python/cad -based ${P}display (${P}display-cad-py), ${MCCODE_STRING}")
Expand All @@ -51,8 +51,8 @@ set(CPACK_NSIS_DISPLAY_NAME "${NSIS_NAME}")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${NSIS_NAME}")

# Debian
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}-${MCCODE_VERSION}, python3, python3-ply, python3-numpy")

set(CPACK_DEBIAN_PACKAGE_DEPENDS "${FLAVOR}, python3, python3-ply, python3-numpy")
set(CPACK_DEBIAN_PACKAGE_REPLACES "${FLAVOR}-tools-python-${P}display-cad-3.5.1")
# RPM
if (RPMPROFILE)
if (RPMPROFILE STREQUAL "fedora")
Expand Down
Loading