Commit c56dc4ee authored by Matthew Woehlke's avatar Matthew Woehlke

Install headers.

When QT_TESTING_INSTALL_DEVELOPMENT is on, also install the headers,
instead of (in the installed QtTestingConfig.cmake) referencing them
from a combination of the source and build directories.
parent 28a6aabd
...@@ -17,6 +17,10 @@ IF(NOT DEFINED QtTesting_INSTALL_BIN_DIR) ...@@ -17,6 +17,10 @@ IF(NOT DEFINED QtTesting_INSTALL_BIN_DIR)
SET(QtTesting_INSTALL_BIN_DIR bin) SET(QtTesting_INSTALL_BIN_DIR bin)
ENDIF() ENDIF()
IF(NOT DEFINED QtTesting_INSTALL_INCLUDE_DIR)
SET(QtTesting_INSTALL_INCLUDE_DIR include/QtTesting)
ENDIF()
IF(NOT DEFINED QtTesting_INSTALL_LIB_DIR) IF(NOT DEFINED QtTesting_INSTALL_LIB_DIR)
SET(QtTesting_INSTALL_LIB_DIR lib) SET(QtTesting_INSTALL_LIB_DIR lib)
ENDIF() ENDIF()
...@@ -112,80 +116,88 @@ QT4_WRAP_UI(UI_BUILT_SOURCES ...@@ -112,80 +116,88 @@ QT4_WRAP_UI(UI_BUILT_SOURCES
pqRecordEventsDialog.ui pqRecordEventsDialog.ui
) )
ADD_LIBRARY(QtTesting SET(QtTesting_SOURCES
QtTestingExport.h
pq3DViewEventPlayer.cxx pq3DViewEventPlayer.cxx
pq3DViewEventPlayer.h
pq3DViewEventTranslator.cxx pq3DViewEventTranslator.cxx
pq3DViewEventTranslator.h
pqAbstractActivateEventPlayer.cxx pqAbstractActivateEventPlayer.cxx
pqAbstractActivateEventPlayer.h
pqAbstractBooleanEventPlayer.cxx pqAbstractBooleanEventPlayer.cxx
pqAbstractBooleanEventPlayer.h
pqAbstractButtonEventTranslator.cxx pqAbstractButtonEventTranslator.cxx
pqAbstractButtonEventTranslator.h
pqAbstractDoubleEventPlayer.cxx pqAbstractDoubleEventPlayer.cxx
pqAbstractDoubleEventPlayer.h
pqAbstractIntEventPlayer.cxx pqAbstractIntEventPlayer.cxx
pqAbstractIntEventPlayer.h
pqAbstractItemViewEventPlayer.cxx pqAbstractItemViewEventPlayer.cxx
pqAbstractItemViewEventPlayer.h
pqAbstractItemViewEventTranslator.cxx pqAbstractItemViewEventTranslator.cxx
pqAbstractItemViewEventTranslator.h
pqAbstractMiscellaneousEventPlayer.cxx pqAbstractMiscellaneousEventPlayer.cxx
pqAbstractMiscellaneousEventPlayer.h
pqAbstractSliderEventTranslator.cxx pqAbstractSliderEventTranslator.cxx
pqAbstractSliderEventTranslator.h
pqAbstractStringEventPlayer.cxx pqAbstractStringEventPlayer.cxx
pqAbstractStringEventPlayer.h
pqBasicWidgetEventPlayer.cxx pqBasicWidgetEventPlayer.cxx
pqBasicWidgetEventPlayer.h
pqBasicWidgetEventTranslator.cxx pqBasicWidgetEventTranslator.cxx
pqBasicWidgetEventTranslator.h
pqComboBoxEventTranslator.cxx pqComboBoxEventTranslator.cxx
pqComboBoxEventTranslator.h
pqDoubleSpinBoxEventTranslator.cxx pqDoubleSpinBoxEventTranslator.cxx
pqDoubleSpinBoxEventTranslator.h
pqEventDispatcher.cxx pqEventDispatcher.cxx
pqEventDispatcher.h
pqEventObserver.cxx pqEventObserver.cxx
pqEventObserver.h
pqEventPlayer.cxx pqEventPlayer.cxx
pqEventPlayer.h
pqEventTranslator.cxx pqEventTranslator.cxx
pqLineEditEventTranslator.cxx
pqNativeFileDialogEventPlayer.cxx
pqNativeFileDialogEventTranslator.cxx
pqMenuEventTranslator.cxx
pqObjectNaming.cxx
pqRecordEventsDialog.cxx
pqSpinBoxEventTranslator.cxx
pqStdoutEventObserver.cxx
pqTabBarEventPlayer.cxx
pqTabBarEventTranslator.cxx
pqTestUtility.cxx
pqThreadedEventSource.cxx
pqTreeViewEventTranslator.cxx
pqTreeViewEventPlayer.cxx
pqWidgetEventPlayer.cxx
)
SET(QtTesting_DEVEL_HEADERS
pq3DViewEventPlayer.h
pq3DViewEventTranslator.h
pqAbstractActivateEventPlayer.h
pqAbstractMiscellaneousEventPlayer.h
pqAbstractDoubleEventPlayer.h
pqAbstractBooleanEventPlayer.h
pqAbstractButtonEventTranslator.h
pqAbstractIntEventPlayer.h
pqAbstractItemViewEventPlayer.h
pqAbstractItemViewEventTranslator.h
pqAbstractSliderEventTranslator.h
pqAbstractStringEventPlayer.h
pqBasicWidgetEventPlayer.h
pqBasicWidgetEventTranslator.h
pqComboBoxEventTranslator.h
pqDoubleSpinBoxEventTranslator.h
pqEventDispatcher.h
pqEventObserver.h
pqEventPlayer.h
pqEventTranslator.h pqEventTranslator.h
pqEventSource.h pqEventSource.h
pqLineEditEventTranslator.cxx
pqLineEditEventTranslator.h pqLineEditEventTranslator.h
pqNativeFileDialogEventPlayer.cxx
pqNativeFileDialogEventPlayer.h pqNativeFileDialogEventPlayer.h
pqNativeFileDialogEventTranslator.cxx
pqNativeFileDialogEventTranslator.h pqNativeFileDialogEventTranslator.h
pqMenuEventTranslator.cxx
pqMenuEventTranslator.h pqMenuEventTranslator.h
pqObjectNaming.cxx
pqObjectNaming.h pqObjectNaming.h
pqRecordEventsDialog.cxx
pqRecordEventsDialog.h pqRecordEventsDialog.h
pqSpinBoxEventTranslator.cxx
pqSpinBoxEventTranslator.h pqSpinBoxEventTranslator.h
pqStdoutEventObserver.cxx
pqStdoutEventObserver.h pqStdoutEventObserver.h
pqTabBarEventPlayer.cxx
pqTabBarEventPlayer.h pqTabBarEventPlayer.h
pqTabBarEventTranslator.cxx
pqTabBarEventTranslator.h pqTabBarEventTranslator.h
pqTestUtility.cxx
pqTestUtility.h pqTestUtility.h
pqThreadedEventSource.cxx
pqThreadedEventSource.h pqThreadedEventSource.h
pqTreeViewEventTranslator.cxx
pqTreeViewEventTranslator.h pqTreeViewEventTranslator.h
pqTreeViewEventPlayer.cxx
pqTreeViewEventPlayer.h pqTreeViewEventPlayer.h
pqWidgetEventPlayer.cxx
pqWidgetEventPlayer.h pqWidgetEventPlayer.h
pqWidgetEventTranslator.h pqWidgetEventTranslator.h
QtTestingExport.h
${QtTesting_BINARY_DIR}/QtTestingConfigure.h
)
ADD_LIBRARY(QtTesting
${QtTesting_SOURCES}
${MOC_BUILT_SOURCES} ${MOC_BUILT_SOURCES}
${UI_BUILT_SOURCES} ${UI_BUILT_SOURCES}
${PYTHON_SRCS} ${PYTHON_SRCS}
...@@ -227,6 +239,13 @@ configure_file( ...@@ -227,6 +239,13 @@ configure_file(
) )
# Set up the install export # Set up the install export
IF(IS_ABSOLUTE QtTesting_INSTALL_INCLUDE_DIR)
set(QtTesting_INSTALL_INCLUDE_FULL_DIR "${QtTesting_INSTALL_INCLUDE_DIR}")
ELSE()
set(QtTesting_INSTALL_INCLUDE_FULL_DIR "${CMAKE_INSTALL_PREFIX}/${QtTesting_INSTALL_INCLUDE_DIR}")
get_filename_component(QtTesting_INSTALL_INCLUDE_FULL_DIR "${QtTesting_INSTALL_INCLUDE_FULL_DIR}" ABSOLUTE)
ENDIF()
IF(IS_ABSOLUTE QtTesting_INSTALL_LIB_DIR) IF(IS_ABSOLUTE QtTesting_INSTALL_LIB_DIR)
set(QtTesting_INSTALL_LIB_FULL_DIR "${QtTesting_INSTALL_LIB_DIR}") set(QtTesting_INSTALL_LIB_FULL_DIR "${QtTesting_INSTALL_LIB_DIR}")
ELSE() ELSE()
...@@ -242,6 +261,10 @@ configure_file( ...@@ -242,6 +261,10 @@ configure_file(
) )
IF(QT_TESTING_INSTALL_DEVELOPMENT) IF(QT_TESTING_INSTALL_DEVELOPMENT)
install( FILES ${QtTesting_DEVEL_HEADERS}
DESTINATION ${QtTesting_INSTALL_INCLUDE_DIR}
)
# Configure the CMake EXPORT file during installation # Configure the CMake EXPORT file during installation
install( FILES ${QtTesting_BINARY_DIR}/CMakeFiles/QtTestingConfig.cmake install( FILES ${QtTesting_BINARY_DIR}/CMakeFiles/QtTestingConfig.cmake
DESTINATION ${QtTesting_INSTALL_CMAKE_DIR} DESTINATION ${QtTesting_INSTALL_CMAKE_DIR}
......
set(QtTesting_INCLUDE_DIRS "@QtTesting_SOURCE_DIR@;@QtTesting_BINARY_DIR@") set(QtTesting_INCLUDE_DIRS "@QtTesting_INSTALL_INCLUDE_FULL_DIR@")
set(QtTesting_LIBRARY_DIR "@QtTesting_INSTALL_LIB_FULL_DIR@") set(QtTesting_LIBRARY_DIR "@QtTesting_INSTALL_LIB_FULL_DIR@")
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