소스 검색

Merge branch '203-pythonqt-build-error'

* 203-pythonqt-build-error:
  Library depending on debug build of PythonQt will link against correct python library
Jean-Christophe Fillion-Robin 13 년 전
부모
커밋
ba271a0532
1개의 변경된 파일3개의 추가작업 그리고 0개의 파일을 삭제
  1. 3 0
      Utilities/CMake/FindPythonQt.cmake

+ 3 - 0
Utilities/CMake/FindPythonQt.cmake

@@ -25,6 +25,9 @@ endif()
 
 
 set(PYTHONQT_FOUND 0)
 set(PYTHONQT_FOUND 0)
 if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY)
 if(PYTHONQT_INCLUDE_DIR AND PYTHONQT_LIBRARY)
+  # Currently CMake'ified PythonQt only supports building against a python Release build. 
+  # This applies independently of CTK build type (Release, Debug, ...)
+  add_definitions(-DPYTHONQT_USE_RELEASE_PYTHON_FALLBACK)
   set(PYTHONQT_FOUND 1)
   set(PYTHONQT_FOUND 1)
   set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL})
   set(PYTHONQT_LIBRARIES ${PYTHONQT_LIBRARY} ${PYTHONQT_LIBUTIL})
 endif()
 endif()