From e41bf9c3076b7c862437038c583ee9d8c9d0f6cb Mon Sep 17 00:00:00 2001 From: Janik Zikovsky <zikovskyjl@ornl.gov> Date: Mon, 12 Dec 2011 15:02:23 -0500 Subject: [PATCH] Refs #4277: case sensitivity fix for windows --- Code/Mantid/MantidQt/CMakeLists.txt | 8 ++++---- Code/Mantid/MantidQt/mantidqt.sip | 2 +- Code/Mantid/MantidQt/sip_mantidqt.cpp.in | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Code/Mantid/MantidQt/CMakeLists.txt b/Code/Mantid/MantidQt/CMakeLists.txt index fdef6079555..f8439f5a86f 100644 --- a/Code/Mantid/MantidQt/CMakeLists.txt +++ b/Code/Mantid/MantidQt/CMakeLists.txt @@ -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 siplibmantidpythonqtpart0.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 ( mantidqtpython ${SIP_SRC} ) # ... and links to other required libs -target_link_libraries ( mantidqt MantidQtAPI QtPropertyBrowser MantidQtSliceViewer ${QT_LIBRARIES} ${QWT_LIBRARIES} ) +target_link_libraries ( mantidqtpython 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 mantidqtpython DESTINATION ${LIB_DIR} ) diff --git a/Code/Mantid/MantidQt/mantidqt.sip b/Code/Mantid/MantidQt/mantidqt.sip index a079f8a94d1..c541a0495fd 100644 --- a/Code/Mantid/MantidQt/mantidqt.sip +++ b/Code/Mantid/MantidQt/mantidqt.sip @@ -7,7 +7,7 @@ */ // Define the module name. This has to match the library filename -%Module libmantidqt +%Module libmantidqtpython /******************************** SIP Imports ****************/ %Import QtCore/QtCoremod.sip diff --git a/Code/Mantid/MantidQt/sip_mantidqt.cpp.in b/Code/Mantid/MantidQt/sip_mantidqt.cpp.in index 7b295c1d217..a747c000edb 100644 --- a/Code/Mantid/MantidQt/sip_mantidqt.cpp.in +++ b/Code/Mantid/MantidQt/sip_mantidqt.cpp.in @@ -10,4 +10,4 @@ #pragma GCC diagnostic ignored "-Wcast-qual" #endif -#include "siplibmantidqtpart0.cpp" +#include "siplibmantidqtpythonpart0.cpp" -- GitLab