~ps-jenkins/compiz/latestsnapshot-10.9.10+13.10.20131011-0ubuntu1

Viewing changes to cmake/CompizCommon.cmake

Committer: Sam Spilsbury
Date: 2013-02-12 04:30:52 UTC
mto: This revision was merged to the branch mainline in revision 3612.
Revision ID: sam.spilsbury@canonical.com-20130212043052-mvpzzf6e2vxzvo00

Clean up the Find Google Test and Xorg GTest logic, put them in their own cmake files
behind their own functions. Make it so that all users can see xorg-gtest and not just the users
in tests/

files added:
cmake/FindGoogleTest.cmake

cmake/FindXorgGTest.cmake

cmake/GoogleTest.cmake

cmake/XorgGTest.cmake

tests/xorg-gtest

tests/xorg-gtest/CMakeLists.txt

files renamed:
tests/system/xorg-gtest/src/ => tests/xorg-gtest/src/

files modified:
CMakeLists.txt

cmake/CompizCommon.cmake

tests/system/xorg-gtest/CMakeLists.txt

tests/xorg-gtest/src/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

cmake/CompizCommon.cmake

option (COMPIZ_RUN_LDCONFIG "Leave OFF unless you need to run ldconfig after install")

option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)

option (COMPIZ_BUILD_TESTING "Build Unit Tests" ON)

option (BUILD_XORG_GTEST "Build Xorg GTest integration tests" ON)

set (COMPIZ_DATADIR ${CMAKE_INSTALL_PREFIX}/share)

set (COMPIZ_METADATADIR ${CMAKE_INSTALL_PREFIX}/share/compiz)

Older »