Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CTA-LAPP
PHOENIX_LIBS
PhoenixGraph
Commits
d017ef5d
Commit
d017ef5d
authored
Sep 20, 2020
by
Pierre Aubert
Browse files
Update cpack call
parent
3ba30e03
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/CMakeLists.txt
cmake/CMakeLists.txt
+2
-1
cmake/createLinuxPackages.cmake
cmake/createLinuxPackages.cmake
+1
-2
cmake/phoenix_base_project.cmake
cmake/phoenix_base_project.cmake
+1
-0
No files found.
CMakeLists.txt
View file @
d017ef5d
...
...
@@ -22,5 +22,5 @@ endif(SELF_TESTS_MODE)
set
(
PHOENIX_INCLUDE_DIRS
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/src;
${
PHOENIX_INCLUDE_DIRS
}
"
CACHE INTERNAL
"list of Phoenix include dirs"
)
createLinuxPackages
()
cmake/CMakeLists.txt
View file @
d017ef5d
project
(
Phoenix
)
cmake_minimum_required
(
VERSION 2.8
)
include
(
createLinuxPackages.cmake
)
include
(
phoenix_base_project.cmake
)
if
(
NOT MODULE_MODE
)
...
...
@@ -9,5 +10,5 @@ if(NOT MODULE_MODE)
include
(
create_find_project.cmake
)
endif
()
include
(
createLinuxPackages.cmake
)
cmake/createLinuxPackages.cmake
View file @
d017ef5d
...
...
@@ -25,12 +25,11 @@ function(createLinuxPackages)
set
(
CPACK_DEBIAN_PACKAGE_DEPENDS
""
CACHE STRING
"Depends of the program"
)
endif
(
CREATE_DEB
)
if
(
CREATE_RPM
)
#Need to install rmp package on ubuntu which contains rpmbuild
set
(
CPACK_GENERATOR
"RPM"
CACHE STRING
"Package type of the program"
)
set
(
CPACK_RPM_PACKAGE_AUTOREQ
"NO"
CACHE STRING
"Caracteristics of the program"
)
set
(
CPACK_RPM_PACKAGE_REQUIRES
""
CACHE STRING
"Depends of the program"
)
set
(
LIBRARY_DIRECTORY
"lib64"
CACHE STRING
"define the library directory (especially for Fedora with the wtf lib64)"
FORCE
)
endif
(
CREATE_RPM
)
# if(CREATE_DMG) #We should use DragNDrop or PackageMaker of osx
...
...
cmake/phoenix_base_project.cmake
View file @
d017ef5d
...
...
@@ -31,6 +31,7 @@ function(phoenix_base_project programName programVersion programDescritpion prog
if
(
DOC_MODE
)
add_subdirectory
(
doc
)
endif
()
createLinuxPackages
()
endif
()
endfunction
(
phoenix_base_project
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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