Ver código fonte

ENH: Add PYTHONQT_INSTALL_DIR to CTKConfig

Doing so will allow project including CTK to use the same installation of
PythonQt.
Jean-Christophe Fillion-Robin 14 anos atrás
pai
commit
5291bfca75

+ 4 - 1
CTKConfig.cmake.in

@@ -83,7 +83,10 @@ SET(CTK_RUNTIME_LIBRARY_DIRS "@CTK_RUNTIME_LIBRARY_DIRS_CONFIG@")
 # will be the parent directories under which there will be a directory
 # of runtime libraries for each configuration type.
 SET(CTK_QTDESIGNERPLUGINS_DIR "@CTK_QTDESIGNERPLUGINS_DIR_CONFIG@")
- 
+
+# CTK PythonQt install directory
+SET(CTK_PYTHONQT_INSTALL_DIR "@CTK_PYTHONQT_INSTALL_DIR_CONFIG@")
+
 # The CTK version number
 SET(CTK_MAJOR_VERSION "@CTK_MAJOR_VERSION@")
 SET(CTK_MINOR_VERSION "@CTK_MINOR_VERSION@")

+ 3 - 0
Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -87,6 +87,9 @@ SET(CTK_EXECUTABLE_DIRS_CONFIG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 # QtDesigner plugins directory
 SET(CTK_QTDESIGNERPLUGINS_DIR_CONFIG ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 
+# PythonQt directory
+SET(CTK_PYTHONQT_INSTALL_DIR_CONFIG ${PYTHONQT_INSTALL_DIR})
+
 # Executable locations.
 
 # CMake extension module directory.