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
e41bf9c3
Commit
e41bf9c3
authored
13 years ago
by
Janik Zikovsky
Browse files
Options
Downloads
Patches
Plain Diff
Refs #4277: case sensitivity fix for windows
parent
7319812f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Code/Mantid/MantidQt/CMakeLists.txt
+4
-4
4 additions, 4 deletions
Code/Mantid/MantidQt/CMakeLists.txt
Code/Mantid/MantidQt/mantidqt.sip
+1
-1
1 addition, 1 deletion
Code/Mantid/MantidQt/mantidqt.sip
Code/Mantid/MantidQt/sip_mantidqt.cpp.in
+1
-1
1 addition, 1 deletion
Code/Mantid/MantidQt/sip_mantidqt.cpp.in
with
6 additions
and
6 deletions
Code/Mantid/MantidQt/CMakeLists.txt
+
4
−
4
View file @
e41bf9c3
...
...
@@ -44,7 +44,7 @@ separate_arguments ( PYQT4_SIP_FLAGS )
set
(
SIP_SPEC
${
CMAKE_CURRENT_SOURCE_DIR
}
/mantidqt.sip
)
set
(
SIP_SRC_IN
${
CMAKE_CURRENT_SOURCE_DIR
}
/sip_mantidqt.cpp.in
)
set
(
SIP_SRC
${
CMAKE_CURRENT_BINARY_DIR
}
/sip_mantidqt.cpp
)
set
(
SIP_SRC_AUTO siplibmantidqtpart0.cpp
)
set
(
SIP_SRC_AUTO siplibmantid
python
qtpart0.cpp
)
# We need to manually add all the headers that are in the sip file
# so that the dependencies are known to CMake
...
...
@@ -89,10 +89,10 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/SliceViewer/inc )
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
/SliceViewer
)
# to find the ui_*.h auto-generated files
# This creates the target library, just for python bindings
add_library
(
mantidqt
${
SIP_SRC
}
)
add_library
(
mantidqt
python
${
SIP_SRC
}
)
# ... and links to other required libs
target_link_libraries
(
mantidqt MantidQtAPI QtPropertyBrowser MantidQtSliceViewer
${
QT_LIBRARIES
}
${
QWT_LIBRARIES
}
)
target_link_libraries
(
mantidqt
python
MantidQtAPI QtPropertyBrowser MantidQtSliceViewer
${
QT_LIBRARIES
}
${
QWT_LIBRARIES
}
)
...
...
@@ -100,5 +100,5 @@ target_link_libraries ( mantidqt MantidQtAPI QtPropertyBrowser MantidQtSliceView
# Installation settings
###########################################################################
install
(
TARGETS mantidqt DESTINATION
${
LIB_DIR
}
)
install
(
TARGETS mantidqt
python
DESTINATION
${
LIB_DIR
}
)
This diff is collapsed.
Click to expand it.
Code/Mantid/MantidQt/mantidqt.sip
+
1
−
1
View file @
e41bf9c3
...
...
@@ -7,7 +7,7 @@
*/
// Define the module name. This has to match the library filename
%Module libmantidqt
%Module libmantidqt
python
/******************************** SIP Imports ****************/
%Import QtCore/QtCoremod.sip
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/MantidQt/sip_mantidqt.cpp.in
+
1
−
1
View file @
e41bf9c3
...
...
@@ -10,4 +10,4 @@
#pragma GCC diagnostic ignored "-Wcast-qual"
#endif
#include "siplibmantidqtpart0.cpp"
#include "siplibmantidqtp
ythonp
art0.cpp"
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