diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 17:56:29 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-09-12 17:56:29 +0200 |
| commit | cde7423958e9c233233c79399553787cf0931714 (patch) | |
| tree | 3b3c8d2b8d13fb54da85f6f7b800400520eac2f1 /tools/ctest_scripts/travis-ci.cmake | |
| parent | 6c157b60f2478f2b6776e5a94495103f46d9d500 (diff) | |
Travis add mingw
Diffstat (limited to 'tools/ctest_scripts/travis-ci.cmake')
| -rw-r--r-- | tools/ctest_scripts/travis-ci.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake index 36596a09..371235a4 100644 --- a/tools/ctest_scripts/travis-ci.cmake +++ b/tools/ctest_scripts/travis-ci.cmake @@ -44,7 +44,11 @@ if ("$ENV{OPJ_CI_ASAN}" STREQUAL "1") set(OPJ_HAS_MEMCHECK TRUE) set(CTEST_MEMORYCHECK_TYPE "AddressSanitizer") set(CCFLAGS_ARCH "${CCFLAGS_ARCH} -g -fsanitize=address -fno-omit-frame-pointer") - +endif() + +if("$ENV{CC}" MATCHES ".*mingw.*") + # We are trying to use mingw + set(CTEST_CONFIGURE_OPTIONS "-DCMAKE_TOOLCHAIN_FILE=${CTEST_SCRIPT_DIRECTORY}/toolchain-mingw64.cmake") endif() if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1") @@ -110,7 +114,7 @@ file(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "${CACHE_CONTENTS}") # Perform a Experimental build ctest_start(Experimental) #ctest_update(SOURCE "${CTEST_SOURCE_DIRECTORY}") -ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}") +ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" OPTIONS "${CTEST_CONFIGURE_OPTIONS}") ctest_read_custom_files(${CTEST_BINARY_DIRECTORY}) ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}") if(NOT "$ENV{OPJ_CI_SKIP_TESTS}" STREQUAL "1") @@ -122,4 +126,4 @@ endif() if ("$ENV{OPJ_DO_SUBMIT}" STREQUAL "1") ctest_submit() endif() -ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" ) +#ctest_empty_binary_directory( "${CTEST_BINARY_DIRECTORY}" ) |