mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 20:12:40 +02:00
Code Issues Projects Releases Wiki Activity

extended support for lua to v5.3; removed some duplicate messages showing up during 'cmake configuration' time

Browse Source
This commit is contained in:
filux
2015-08-20 16:43:14 +02:00
parent 7018deef4a
commit 617bc9a89e
11 changed files with 158 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
mk/cmake/Modules/FindCppUnit.cmake
View File

@@ -15,81 +15,76 @@ set (_cppunit_DEBUG false)
# If CPPUNIT_ROOT was defined in the environment, use it.
if (NOT CPPUNIT_ROOT AND NOT $ENV{CPPUNIT_ROOT} STREQUAL "")
set(CPPUNIT_ROOT $ENV{CPPUNIT_ROOT})
endif(NOT CPPUNIT_ROOT AND NOT $ENV{CPPUNIT_ROOT} STREQUAL "")
set(CPPUNIT_ROOT $ENV{CPPUNIT_ROOT})
endif()
# If CPPUNIT_INCLUDEDIR was defined in the environment, use it.
if( NOT $ENV{CPPUNIT_INCLUDEDIR} STREQUAL "" )
set(CPPUNIT_INCLUDEDIR $ENV{CPPUNIT_INCLUDEDIR})
endif( NOT $ENV{CPPUNIT_INCLUDEDIR} STREQUAL "" )
set(CPPUNIT_INCLUDEDIR $ENV{CPPUNIT_INCLUDEDIR})
endif()
# If CPPUNIT_LIBRARYDIR was defined in the environment, use it.
if( NOT $ENV{CPPUNIT_LIBRARYDIR} STREQUAL "" )
set(CPPUNIT_LIBRARYDIR $ENV{CPPUNIT_LIBRARYDIR})
endif( NOT $ENV{CPPUNIT_LIBRARYDIR} STREQUAL "" )
set(CPPUNIT_LIBRARYDIR $ENV{CPPUNIT_LIBRARYDIR})
endif()
if( CPPUNIT_ROOT )
set(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_ROOT}/include )
set(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_ROOT}/lib )
endif( CPPUNIT_ROOT )
set(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_ROOT}/include )
set(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_ROOT}/lib )
endif()
if( CPPUNIT_INCLUDEDIR )
file(TO_CMAKE_PATH ${CPPUNIT_INCLUDEDIR} CPPUNIT_INCLUDEDIR)
SET(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_INCLUDEDIR} )
endif( CPPUNIT_INCLUDEDIR )
file(TO_CMAKE_PATH ${CPPUNIT_INCLUDEDIR} CPPUNIT_INCLUDEDIR)
SET(_cppunit_INCLUDE_SEARCH_DIRS
${CPPUNIT_INCLUDEDIR} )
endif()
if( CPPUNIT_LIBRARYDIR )
file(TO_CMAKE_PATH ${CPPUNIT_LIBRARYDIR} CPPUNIT_LIBRARYDIR)
SET(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_LIBRARYDIR} )
endif( CPPUNIT_LIBRARYDIR )
# now find CPPUNIT_INCLUDE_DIR
file(TO_CMAKE_PATH ${CPPUNIT_LIBRARYDIR} CPPUNIT_LIBRARYDIR)
SET(_cppunit_LIBRARY_SEARCH_DIRS
${CPPUNIT_LIBRARYDIR} )
endif()
if ( _cppunit_DEBUG)
message(STATUS "search include dirs for cppunit = ${_cppunit_INCLUDE_SEARCH_DIRS}")
endif ( _cppunit_DEBUG)
endif ()
find_path(CPPUNIT_INCLUDE_DIR
NAMES cppunit/Test.h
HINTS ${_cppunit_INCLUDE_SEARCH_DIRS})
# now find CPPUNIT_INCLUDE_DIR
find_path(CPPUNIT_INCLUDE_DIR
NAMES cppunit/Test.h
HINTS ${_cppunit_INCLUDE_SEARCH_DIRS})
if ( _cppunit_DEBUG)
message(STATUS "include dir for cppunit = ${CPPUNIT_INCLUDE_DIR}")
endif ( _cppunit_DEBUG)
message(STATUS "include dir for cppunit = ${CPPUNIT_INCLUDE_DIR}")
message(STATUS "search library dirs for cppunit = ${_cppunit_LIBRARY_SEARCH_DIRS}")
endif ()
# now find CPPUNIT_LIBRARY
find_library(CPPUNIT_LIBRARY
NAMES cppunit
HINTS ${_cppunit_LIBRARY_SEARCH_DIRS})
if ( _cppunit_DEBUG)
message(STATUS "search library dirs for cppunit = ${_cppunit_LIBRARY_SEARCH_DIRS}")
endif ( _cppunit_DEBUG)
find_library(CPPUNIT_LIBRARY
NAMES cppunit
HINTS ${_cppunit_LIBRARY_SEARCH_DIRS})
if ( _cppunit_DEBUG)
message(STATUS "library dir for cppunit = ${CPPUNIT_LIBRARY}")
endif ( _cppunit_DEBUG)
message(STATUS "library dir for cppunit = ${CPPUNIT_LIBRARY}")
endif ()
if (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
SET(CPPUNIT_FOUND TRUE)
endif (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
SET(CPPUNIT_FOUND TRUE)
endif ()
if (CPPUNIT_FOUND)
# show which CppUnit was found only if not quiet
if (NOT CppUnit_FIND_QUIETLY)
message(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}")
endif (NOT CppUnit_FIND_QUIETLY)
else (CPPUNIT_FOUND)
# fatal error if CppUnit is required but not found
if (CppUnit_FIND_REQUIRED)
message(FATAL_ERROR "Could not find CppUnit")
endif (CppUnit_FIND_REQUIRED)
endif (CPPUNIT_FOUND)
# show which CppUnit was found only if not quiet
if (NOT CppUnit_FIND_QUIETLY)
#message(STATUS "Found CppUnit: ${CPPUNIT_LIBRARY}")
endif ()
else ()
# fatal error if CppUnit is required but not found
if (CppUnit_FIND_REQUIRED)
message(FATAL_ERROR "Could not find CppUnit")
endif ()
endif ()
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CPPUNIT DEFAULT_MSG CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR)