Skip to content

Commit

Permalink
Link Python libraries to the _kernel module and nothing else.
Browse files Browse the repository at this point in the history
Refs #7798
  • Loading branch information
martyngigg committed Aug 7, 2014
1 parent a68ab6c commit f45fd59
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/PythonInterface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ include_directories ( SYSTEM ${PYTHON_NUMPY_INCLUDE_DIR} )
set ( HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/inc/MantidPythonInterface )
include_directories ( inc )
add_definitions ( -DBOOST_DEBUG_PYTHON -DBOOST_PYTHON_NO_LIB -DNPY_NO_DEPRECATED_API=NPY_1_7_API_VERSION )
set ( PYTHON_DEPS ${Boost_LIBRARIES} ${MPI_CXX_LIBRARIES} )
set ( PYTHON_DEPS ${MPI_CXX_LIBRARIES} )

####################################################################################
# A macro for generating the exports
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ set_python_properties( PythonKernelModule _kernel )
set_target_output_directory ( PythonKernelModule ${OUTPUT_DIR} .pyd )
# Add the required dependencies
# Kernel must be first. See comments in Framework/Kernel/CMakeLists.txt
target_link_libraries ( PythonKernelModule Kernel ${PYTHON_DEPS} )
target_link_libraries ( PythonKernelModule Kernel ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${PYTHON_DEPS} )

###########################################################################
# Installation settings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if ( CXXTEST_FOUND )
if ( WIN32 )
set_target_properties( PythonInterfaceCppTest PROPERTIES COMPILE_FLAGS "/w44244" )
endif ()
target_link_libraries( PythonInterfaceCppTest PythonKernelModule PythonAPIModule ${PYTHON_LIBRARIES} )
target_link_libraries( PythonInterfaceCppTest PythonKernelModule PythonAPIModule )
add_dependencies ( FrameworkTests PythonInterfaceCppTest )
# Add to the 'UnitTests' group in VS
set_property ( TARGET PythonInterfaceCppTest PROPERTY FOLDER "UnitTests" )
Expand Down

0 comments on commit f45fd59

Please sign in to comment.