diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-31 23:53:39 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-31 23:53:39 (GMT) |
| commit | 7860d85daa41bc97bc907a7864986dc2df899729 (patch) | |
| tree | 34513018ff83204b9fae9de07f8797411eaebcd3 | |
| parent | 807261e01ee26bf54506d0adbeebe9fb683fb316 (diff) | |
add -no-strict-aliasing for mingw cross compiles. add lzma lib flag
| -rw-r--r-- | tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/CMingw-env-cross.cmake | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e03c39a..e803146 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,6 +13,9 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") # Build debug build as default if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE RelWithDebInfo) +endif() + +if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") endif() diff --git a/tests/CMingw-env-cross.cmake b/tests/CMingw-env-cross.cmake index a8530e9..8b802fc 100644 --- a/tests/CMingw-env-cross.cmake +++ b/tests/CMingw-env-cross.cmake @@ -88,7 +88,7 @@ endfunction() function(mingw_cross_env_add_missing_libs) # mingw_cross_env_info() - set(mingw_cross_libs imm32 winmm ws2_32 glu32 opengl32 mng lcms tiff jpeg png z) + set(mingw_cross_libs imm32 winmm ws2_32 glu32 opengl32 mng lcms tiff jpeg png z lzma) target_link_libraries(opencsgtest ${mingw_cross_libs}) target_link_libraries(csgtermtest ${mingw_cross_libs}) target_link_libraries(csgtexttest ${mingw_cross_libs}) |