Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
a4bb328e
Commit
a4bb328e
authored
8 years ago
by
Peterson, Peter
Browse files
Options
Downloads
Patches
Plain Diff
Exclude scripts/test directory from packaging
parent
1d1f5065
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Framework/CMakeLists.txt
+17
-10
17 additions, 10 deletions
Framework/CMakeLists.txt
with
17 additions
and
10 deletions
Framework/CMakeLists.txt
+
17
−
10
View file @
a4bb328e
...
@@ -174,20 +174,27 @@ install ( DIRECTORY ../instrument/ DESTINATION ${INBUNDLE}instrument
...
@@ -174,20 +174,27 @@ install ( DIRECTORY ../instrument/ DESTINATION ${INBUNDLE}instrument
if
(
WIN32
)
# General windows environment
if
(
WIN32
)
# General windows environment
if
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
# Recommended way of detecting 64- vs 32-bit build
if
(
CMAKE_SIZEOF_VOID_P EQUAL 8
)
# Recommended way of detecting 64- vs 32-bit build
# Excludes .so files & _win32 binaries
# Excludes .so files & _win32 binaries
install
(
DIRECTORY ../scripts/ DESTINATION
${
INBUNDLE
}
scripts PATTERN
"*.pyc"
EXCLUDE
install
(
DIRECTORY ../scripts/ DESTINATION
${
INBUNDLE
}
scripts PATTERN
"*.pyc"
PATTERN
".svn"
EXCLUDE PATTERN
"*.so"
EXCLUDE PATTERN
"*_win32.pyd"
EXCLUDE PATTERN
"CMakeLists.txt"
EXCLUDE
)
EXCLUDE PATTERN
".svn"
EXCLUDE PATTERN
".gitignore"
EXCLUDE PATTERN
"*.so"
EXCLUDE PATTERN
"*_win32.pyd"
EXCLUDE PATTERN
"CMakeLists.txt"
EXCLUDE PATTERN
"test/*"
EXCLUDE
)
else
()
else
()
# Excludes so files & _win64 binaries
# Excludes so files & _win64 binaries
install
(
DIRECTORY ../scripts/ DESTINATION
${
INBUNDLE
}
scripts PATTERN
"*.pyc"
EXCLUDE
install
(
DIRECTORY ../scripts/ DESTINATION
${
INBUNDLE
}
scripts PATTERN
"*.pyc"
PATTERN
".svn"
EXCLUDE PATTERN
"*.so"
EXCLUDE PATTERN
"*_win64.pyd"
EXCLUDE PATTERN
"CMakeLists.txt"
EXCLUDE
)
EXCLUDE PATTERN
".svn"
EXCLUDE PATTERN
".gitignore"
EXCLUDE PATTERN
"*.so"
EXCLUDE PATTERN
"*_win64.pyd"
EXCLUDE PATTERN
"CMakeLists.txt"
EXCLUDE PATTERN
"test/*"
EXCLUDE
)
endif
()
endif
()
# Also ship mingw libraries for Inelastic fortran code. We need to do a better job here and build things
file
(
GLOB MINGW_DLLS
"
${
THIRD_PARTY_DIR
}
/bin/mingw/*.dll"
)
# Also ship mingw libraries for Inelastic fortran code. We need to do a better job here and build things
install
(
FILES
${
MINGW_DLLS
}
DESTINATION
${
INBUNDLE
}
scripts/Inelastic
)
file
(
GLOB MINGW_DLLS
"
${
THIRD_PARTY_DIR
}
/bin/mingw/*.dll"
)
else
()
install
(
FILES
${
MINGW_DLLS
}
DESTINATION
${
INBUNDLE
}
scripts/Inelastic
)
else
()
# These don't work correctly and the linux ones are in no way general. They really need to be part of the build
# These don't work correctly and the linux ones are in no way general. They really need to be part of the build
install
(
DIRECTORY ../scripts/ DESTINATION
${
INBUNDLE
}
scripts PATTERN
"*.pyc"
EXCLUDE
install
(
DIRECTORY ../scripts/ DESTINATION
${
INBUNDLE
}
scripts PATTERN
"*.pyc"
PATTERN
".svn"
EXCLUDE PATTERN
"*_win*.pyd"
EXCLUDE PATTERN
"*_lnx64.so"
EXCLUDE PATTERN
"CMakeLists.txt"
EXCLUDE
)
EXCLUDE PATTERN
".svn"
EXCLUDE PATTERN
".gitignore"
EXCLUDE PATTERN
"*_win*.pyd"
EXCLUDE PATTERN
"*_lnx64.so"
EXCLUDE PATTERN
"CMakeLists.txt"
EXCLUDE PATTERN
"test/*"
EXCLUDE
)
endif
()
endif
()
# THIS MUST BE THE LAST SUB_DIRECTORY ADDED. See Properties/CMakeLists.txt.
# THIS MUST BE THE LAST SUB_DIRECTORY ADDED. See Properties/CMakeLists.txt.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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