Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
moose
Manage
Activity
Members
Labels
Plan
Issues
9
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sahil Moza
moose
Commits
8c1ca970
Commit
8c1ca970
authored
7 years ago
by
Dilawar Singh
Browse files
Options
Downloads
Patches
Plain Diff
Finally. Needs to write setup.cfg file to make /usr/local and /usr prefix
consistent.
parent
3fdd9e9c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.travis.yml
+0
-2
0 additions, 2 deletions
.travis.yml
debian/rules
+1
-1
1 addition, 1 deletion
debian/rules
moose-core/CMakeLists.txt
+4
-3
4 additions, 3 deletions
moose-core/CMakeLists.txt
moose-core/python/setup.cmake.py
+1
-0
1 addition, 0 deletions
moose-core/python/setup.cmake.py
with
6 additions
and
6 deletions
.travis.yml
+
0
−
2
View file @
8c1ca970
sudo
:
required
dist
:
trusty
group
:
edge
compiler
:
-
gcc
...
...
This diff is collapsed.
Click to expand it.
debian/rules
+
1
−
1
View file @
8c1ca970
...
...
@@ -13,7 +13,7 @@ override_dh_auto_clean:
# consider using -DUSE_VERSIONED_DIR=ON if backporting
override_dh_auto_configure:
cmake -DCMAKE_INSTALL_PREFIX=debian/tmp/usr
cmake -DCMAKE_INSTALL_PREFIX=debian/tmp/usr
-DCMAKE_VERSION=3.2.git
override_dh_auto_build:
make VERBOSE=0 -j`nproc`
...
...
This diff is collapsed.
Click to expand it.
moose-core/CMakeLists.txt
+
4
−
3
View file @
8c1ca970
...
...
@@ -461,11 +461,12 @@ endif( )
# get platform and arch using python.
# NOTE: creating bdist or bdist_dump uses /usr and /usr/local on rpm and deb
# based unix respectively. Not a great situation to be in. We are using
# bdist_egg and then copy everything from egg/.
# based unix respectively. Not a great situation to be in. Need to write a
# setup.cfg file to fix the prefix in all cases.
file
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/python/setup.cfg
"[install]
\n
prefix=/usr"
)
find_package
(
PythonInterp REQUIRED
)
add_custom_target
(
bdist
COMMAND
${
PYTHON_EXECUTABLE
}
setup.cmake.py bdist_
egg
-d
${
PYMOOSE_BDIST_DIR
}
COMMAND
${
PYTHON_EXECUTABLE
}
setup.cmake.py bdist_
dumb
-d
${
PYMOOSE_BDIST_DIR
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/python
COMMENT
"Genearating bdist using setup.cmake.py."
VERBATIM
...
...
This diff is collapsed.
Click to expand it.
moose-core/python/setup.cmake.py
+
1
−
0
View file @
8c1ca970
...
...
@@ -25,6 +25,7 @@ try:
except
Exception
as
e
:
from
distutils.core
import
setup
# Read version from VERSION created by cmake file. This file must be present for
# setup.cmake.py to work perfectly.
script_dir
=
os
.
path
.
dirname
(
os
.
path
.
abspath
(
__file__
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
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!
Save comment
Cancel
Please
register
or
sign in
to comment