diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-09-01 12:08:10 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-09-01 12:08:10 +0000 |
| commit | 9a89e2f162804ab5d39dac0d1e0469816a2cfb45 (patch) | |
| tree | 9457a2c0baafc4b9f4bd00ce933e660cce32bed8 /CMake | |
| parent | e89eb575ac3f6d5076aff5e7d1bf1a442386ebce (diff) | |
backport r898 to r907 in openjpeg-1.5 branch
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/CTestCustom.cmake.in | 5 | ||||
| -rw-r--r-- | CMake/CheckHaveGetopt.cmake | 15 |
2 files changed, 4 insertions, 16 deletions
diff --git a/CMake/CTestCustom.cmake.in b/CMake/CTestCustom.cmake.in index cc5c273f..a85b0510 100644 --- a/CMake/CTestCustom.cmake.in +++ b/CMake/CTestCustom.cmake.in @@ -17,6 +17,7 @@ # #---------------------------------------------------------------------- +SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 1000000) SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_ERRORS 50) SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 2000) @@ -25,7 +26,9 @@ SET(CTEST_CUSTOM_COVERAGE_EXCLUDE # Exclude files from the Testing directories ".*/tests/.*" - ".*/Testing/.*" + + # Exclude files from the ThirdParty Utilities directories + ".*/thirdparty/.*" ) SET(CTEST_CUSTOM_WARNING_EXCEPTION diff --git a/CMake/CheckHaveGetopt.cmake b/CMake/CheckHaveGetopt.cmake deleted file mode 100644 index c0fd5dcf..00000000 --- a/CMake/CheckHaveGetopt.cmake +++ /dev/null @@ -1,15 +0,0 @@ -# Check if getopt is present: -INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) -SET(DONT_HAVE_GETOPT 1) -IF(UNIX) #I am pretty sure only *nix sys have this anyway - CHECK_INCLUDE_FILE("getopt.h" CMAKE_HAVE_GETOPT_H) - # Seems like we need the contrary: - IF(CMAKE_HAVE_GETOPT_H) - SET(DONT_HAVE_GETOPT 0) - ENDIF(CMAKE_HAVE_GETOPT_H) -ENDIF(UNIX) - -IF(DONT_HAVE_GETOPT) - ADD_DEFINITIONS(-DDONT_HAVE_GETOPT) -ENDIF(DONT_HAVE_GETOPT) - |