diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-06 13:25:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-08-06 13:45:03 +0300 |
commit | 9843921288307be33fc39450586ff9ad226829a1 (patch) | |
tree | de6e0ddd71b48d036bf5525e62edf10a57d3238e /extern/gmock/CMakeLists.txt | |
parent | 4571fdde0ecfdebac6a9374364b05be74233aca5 (diff) | |
parent | 28c3bdf50bd62b510fdbd88a5dcb1c40f8726c20 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_physics_cloth.py
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
release/scripts/startup/bl_ui/properties_physics_softbody.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_file/filesel.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesrna/intern/rna_particle.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/makesrna/intern/rna_space.c
Diffstat (limited to 'extern/gmock/CMakeLists.txt')
-rw-r--r-- | extern/gmock/CMakeLists.txt | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/extern/gmock/CMakeLists.txt b/extern/gmock/CMakeLists.txt new file mode 100644 index 00000000000..c0c87009328 --- /dev/null +++ b/extern/gmock/CMakeLists.txt @@ -0,0 +1,66 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2014, Blender Foundation +# All rights reserved. +# +# Contributor(s): Sergey Sharybin +# +# ***** END GPL LICENSE BLOCK ***** + +set(INC + . + include +) + +set(INC_SYS + ../gtest/include +) + +set(SRC + # src/gmock-all.cc + + src/gmock-cardinalities.cc + src/gmock.cc + src/gmock-internal-utils.cc + src/gmock_main.cc + src/gmock-matchers.cc + src/gmock-spec-builders.cc +) + +set(SRC_HEADERS + include/gmock/gmock-actions.h + include/gmock/gmock-cardinalities.h + include/gmock/gmock-generated-actions.h + include/gmock/gmock-generated-function-mockers.h + include/gmock/gmock-generated-matchers.h + include/gmock/gmock-generated-nice-strict.h + include/gmock/gmock.h + include/gmock/gmock-matchers.h + include/gmock/gmock-more-actions.h + include/gmock/gmock-more-matchers.h + include/gmock/gmock-spec-builders.h + include/gmock/internal/custom/gmock-generated-actions.h + include/gmock/internal/custom/gmock-matchers.h + include/gmock/internal/custom/gmock-port.h + include/gmock/internal/gmock-generated-internal-utils.h + include/gmock/internal/gmock-internal-utils.h + include/gmock/internal/gmock-port.h +) + +include_directories(${INC}) +include_directories(SYSTEM ${INC_SYS}) +add_library(extern_gmock ${SRC} ${SRC_HEADERS}) |