mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-10 03:44:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:dacap/aseprite.git

Browse Source
This commit is contained in:
David Capello 2012-03-22 15:08:13 -03:00
commit ea7b4de213
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/CMakeLists.txt
View File

@ -114,10 +114,6 @@ if(USE_SHARED_ALLEGRO4)
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
include_directories(${LIBALLEGRO4_INCLUDE_DIR}) include_directories(${LIBALLEGRO4_INCLUDE_DIR})
# The config.c must be from the last implementation from 4.4 (the
# 4.2 can have a broken override_config_file() impl).
set(EXTRA_SOURCE_FILES allegro/src/config.c)
else() else()
# Use patched version of Allegro 4 (with window resize support). # Use patched version of Allegro 4 (with window resize support).
add_subdirectory(allegro) add_subdirectory(allegro)
@ -138,7 +134,6 @@ add_subdirectory(gui)
add_subdirectory(undo) add_subdirectory(undo)
add_library(aseprite-library add_library(aseprite-library
${EXTRA_SOURCE_FILES}
app.cpp app.cpp
check_args.cpp check_args.cpp
console.cpp console.cpp
@ -434,8 +429,14 @@ function(find_unittests dir dependencies)
DEPENDS ${testname}) DEPENDS ${testname})
set(local_runs ${local_runs} run_${testname}) set(local_runs ${local_runs} run_${testname})
string(REGEX MATCH "_ui_unittest" test_requires_ui ${testname})
if (NOT test_requires_ui STREQUAL "_ui_unittest")
set(local_non_ui_runs ${local_non_ui_runs} run_${testname})
endif()
endforeach() endforeach()
set(all_runs ${all_runs} ${local_runs} PARENT_SCOPE) set(all_runs ${all_runs} ${local_runs} PARENT_SCOPE)
set(non_ui_runs ${non_ui_runs} ${local_non_ui_runs} PARENT_SCOPE)
endfunction() endfunction()
find_unittests(base base-lib ${sys_libs}) find_unittests(base base-lib ${sys_libs})
@ -446,3 +447,4 @@ find_unittests(. ${all_libs})
# To run tests # To run tests
add_custom_target(run_all_unittests DEPENDS ${all_runs}) add_custom_target(run_all_unittests DEPENDS ${all_runs})
add_custom_target(run_non_ui_unittests DEPENDS ${non_ui_runs})

0
src/gui/grid_unittest.cpp → src/gui/grid_ui_unittest.cpp
View File