Commit ac5bca6c authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

BUG: When making binaries, it is necessary to disable Qt python testing since

otherwise the python paths are not setup correctly.  Hence reviving
the QT_TESTING_WITH_PYTHON variable as a settable CMake variable. However it is
overridden by PARAVIEW_ENABLE_PYTHON.
parent 9be9eded
...@@ -3,7 +3,7 @@ PROJECT(QtTesting) ...@@ -3,7 +3,7 @@ PROJECT(QtTesting)
SET(QT_TESTING_WITH_XML ON) SET(QT_TESTING_WITH_XML ON)
IF(QT_TESTING_WITH_PYTHON) IF(PARAVIEW_ENABLE_PYTHON AND QT_TESTING_WITH_PYTHON)
INCLUDE(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake) INCLUDE(${CMAKE_ROOT}/Modules/FindPythonLibs.cmake)
...@@ -33,7 +33,7 @@ IF(QT_TESTING_WITH_PYTHON) ...@@ -33,7 +33,7 @@ IF(QT_TESTING_WITH_PYTHON)
pqPythonEventSource.cxx pqPythonEventSource.cxx
pqPythonEventSource.h pqPythonEventSource.h
) )
ENDIF(QT_TESTING_WITH_PYTHON) ENDIF(PARAVIEW_ENABLE_PYTHON AND QT_TESTING_WITH_PYTHON)
IF(QT_TESTING_WITH_XML) IF(QT_TESTING_WITH_XML)
SET(XML_MOCS SET(XML_MOCS
...@@ -166,12 +166,12 @@ TARGET_LINK_LIBRARIES(QtTesting ...@@ -166,12 +166,12 @@ TARGET_LINK_LIBRARIES(QtTesting
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
IF(QT_TESTING_WITH_PYTHON) IF(PARAVIEW_ENABLE_PYTHON AND QT_TESTING_WITH_PYTHON)
TARGET_LINK_LIBRARIES(QtTesting TARGET_LINK_LIBRARIES(QtTesting
${PYTHON_LIBRARIES} ${PYTHON_LIBRARIES}
${PYTHON_UTIL_LIBRARY_LIB} ${PYTHON_UTIL_LIBRARY_LIB}
) )
ENDIF(QT_TESTING_WITH_PYTHON) ENDIF(PARAVIEW_ENABLE_PYTHON AND QT_TESTING_WITH_PYTHON)
CONFIGURE_FILE(${QtTesting_SOURCE_DIR}/QtTestingConfigure.h.in CONFIGURE_FILE(${QtTesting_SOURCE_DIR}/QtTestingConfigure.h.in
${QtTesting_BINARY_DIR}/QtTestingConfigure.h) ${QtTesting_BINARY_DIR}/QtTestingConfigure.h)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment