Changed: FindCppTest.cmake now can link to a specific STLport version of CppTest
This commit is contained in:
parent
8139ee2911
commit
1927750a9b
1 changed files with 11 additions and 3 deletions
|
@ -24,8 +24,16 @@ FIND_PATH(CPPTEST_INCLUDE_DIR
|
||||||
PATH_SUFFIXES cppunit
|
PATH_SUFFIXES cppunit
|
||||||
)
|
)
|
||||||
|
|
||||||
|
SET(LIBRARY_NAME_RELEASE cpptest)
|
||||||
|
SET(LIBRARY_NAME_DEBUG cpptestd)
|
||||||
|
|
||||||
|
IF(WITH_STLPORT)
|
||||||
|
SET(LIBRARY_NAME_RELEASE cpptest_stlport ${LIBRARY_NAME_RELEASE})
|
||||||
|
SET(LIBRARY_NAME_DEBUG cpptest_stlportd ${LIBRARY_NAME_DEBUG})
|
||||||
|
ENDIF(WITH_STLPORT)
|
||||||
|
|
||||||
FIND_LIBRARY(CPPTEST_LIBRARY_RELEASE
|
FIND_LIBRARY(CPPTEST_LIBRARY_RELEASE
|
||||||
cpptest
|
${LIBRARY_NAME_RELEASE}
|
||||||
PATHS
|
PATHS
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/usr/lib
|
/usr/lib
|
||||||
|
@ -39,7 +47,7 @@ FIND_LIBRARY(CPPTEST_LIBRARY_RELEASE
|
||||||
)
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(CPPTEST_LIBRARY_DEBUG
|
FIND_LIBRARY(CPPTEST_LIBRARY_DEBUG
|
||||||
cpptestd
|
${LIBRARY_NAME_DEBUG}
|
||||||
PATHS
|
PATHS
|
||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/usr/lib
|
/usr/lib
|
||||||
|
@ -54,7 +62,7 @@ FIND_LIBRARY(CPPTEST_LIBRARY_DEBUG
|
||||||
|
|
||||||
IF(CPPTEST_INCLUDE_DIR)
|
IF(CPPTEST_INCLUDE_DIR)
|
||||||
IF(CPPTEST_LIBRARY_RELEASE)
|
IF(CPPTEST_LIBRARY_RELEASE)
|
||||||
SET(CPPTEST_FOUND "YES")
|
SET(CPPTEST_FOUND TRUE)
|
||||||
|
|
||||||
SET(CPPTEST_LIBRARIES "optimized;${CPPTEST_LIBRARY_RELEASE}")
|
SET(CPPTEST_LIBRARIES "optimized;${CPPTEST_LIBRARY_RELEASE}")
|
||||||
IF(CPPTEST_LIBRARY_DEBUG)
|
IF(CPPTEST_LIBRARY_DEBUG)
|
||||||
|
|
Loading…
Reference in a new issue