Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
8e89b0d7
Commit
8e89b0d7
authored
May 08, 2015
by
Fabio Bas
Browse files
Remove spaces and parenthesis from package names; hopefully fix #1063
parent
a8c4e443
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
8e89b0d7
...
@@ -174,6 +174,11 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
...
@@ -174,6 +174,11 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
set
(
CPACK_PACKAGE_VERSION_MINOR
"
${
PROJECT_VERSION_MINOR
}
"
)
set
(
CPACK_PACKAGE_VERSION_MINOR
"
${
PROJECT_VERSION_MINOR
}
"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"
${
PROJECT_VERSION_PATCH
}
"
)
set
(
CPACK_PACKAGE_VERSION_PATCH
"
${
PROJECT_VERSION_PATCH
}
"
)
# Create a version string suitable for file names
string
(
REPLACE
" "
"_"
PROJECT_VERSION_SAFE
"
${
PROJECT_VERSION
}
"
)
string
(
REPLACE
"("
""
PROJECT_VERSION_SAFE
"
${
PROJECT_VERSION_SAFE
}
"
)
string
(
REPLACE
")"
""
PROJECT_VERSION_SAFE
"
${
PROJECT_VERSION_SAFE
}
"
)
if
(
UNIX
)
if
(
UNIX
)
if
(
APPLE
)
if
(
APPLE
)
set
(
CPACK_GENERATOR DragNDrop
${
CPACK_GENERATOR
}
)
set
(
CPACK_GENERATOR DragNDrop
${
CPACK_GENERATOR
}
)
...
@@ -181,18 +186,18 @@ if(UNIX)
...
@@ -181,18 +186,18 @@ if(UNIX)
set
(
CPACK_DMG_FORMAT
"UDBZ"
)
set
(
CPACK_DMG_FORMAT
"UDBZ"
)
set
(
CPACK_DMG_VOLUME_NAME
"
${
PROJECT_NAME
}
"
)
set
(
CPACK_DMG_VOLUME_NAME
"
${
PROJECT_NAME
}
"
)
set
(
CPACK_SYSTEM_NAME
"OSX"
)
set
(
CPACK_SYSTEM_NAME
"OSX"
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
PROJECT_NAME
}
-osx_git-
${
PROJECT_VERSION
}
"
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
PROJECT_NAME
}
-osx_git-
${
PROJECT_VERSION
_SAFE
}
"
)
set
(
CPACK_PACKAGE_ICON
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cockatrice/resources/appicon.icns"
)
set
(
CPACK_PACKAGE_ICON
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/cockatrice/resources/appicon.icns"
)
else
()
else
()
# linux
# linux
set
(
CPACK_GENERATOR DEB
${
CPACK_GENERATOR
}
)
set
(
CPACK_GENERATOR DEB
${
CPACK_GENERATOR
}
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"
${
PROJECT_NAME
}
/
${
PROJECT_VERSION
}
"
)
set
(
CPACK_PACKAGE_INSTALL_DIRECTORY
"
${
PROJECT_NAME
}
/
${
PROJECT_VERSION
_SAFE
}
"
)
set
(
CPACK_STRIP_FILES
"bin/
${
PROJECT_NAME
}
"
)
set
(
CPACK_STRIP_FILES
"bin/
${
PROJECT_NAME
}
"
)
set
(
CPACK_SOURCE_STRIP_FILES
""
)
set
(
CPACK_SOURCE_STRIP_FILES
""
)
endif
()
endif
()
elseif
(
WIN32
)
elseif
(
WIN32
)
set
(
CPACK_GENERATOR NSIS
${
CPACK_GENERATOR
}
)
set
(
CPACK_GENERATOR NSIS
${
CPACK_GENERATOR
}
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
PROJECT_NAME
}
_win32_git-
${
PROJECT_VERSION
}
"
)
set
(
CPACK_PACKAGE_FILE_NAME
"
${
PROJECT_NAME
}
_win32_git-
${
PROJECT_VERSION
_SAFE
}
"
)
# Configure file with custom definitions for NSIS.
# Configure file with custom definitions for NSIS.
configure_file
(
configure_file
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment