AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Move the find_package(Qt4...) bit into the root CMakeLists.txt file since it is used by both the tests and library subdirectories.

Browse Source
This commit is contained in:
Matt Williams 2010-07-02 10:49:47 +00:00
parent 11f47ba86d
commit 765739f450
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -9,6 +9,10 @@ SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX
FIND_PACKAGE(Doxygen)
# Qt is required for building the tests and optionally for bundling the documentation
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtTest REQUIRED)
INCLUDE(${QT_USE_FILE})
IF(WIN32)
#These are used on Windows to ensure that the .exe's and .dll get placed in the ame directory, so that we can run them.
#Note they are actually deprecated in favour of 'RUNTIME_OUTPUT_DIRECTORY' et al, but these replacements apparently don't

4
tests/CMakeLists.txt
View File

@ -15,10 +15,6 @@ MACRO(CREATE_TEST headerfile sourcefile executablename)
ENDIF(WIN32)
ENDMACRO(CREATE_TEST)
# Find the QTestLib stuff
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtTest REQUIRED)
INCLUDE(${QT_USE_FILE})
IF(NOT QT_QTTEST_FOUND)
MESSAGE(STATUS "QtTest not found. Either install it or disable tests by setting BUILD_TESTING to OFF")
ENDIF()