diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-25 20:07:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 20:07:04 +0200 |
| commit | 696358957617dff59f40d5ff7befa9924982578c (patch) | |
| tree | da76c96b706913218d213391884e3b31139c77d1 /test cases | |
| parent | 7677a38e1a8679b44a818bf3782a3fa6472e17f8 (diff) | |
| parent | f2114fa167363925791e8f10cfc793b3bc317690 (diff) | |
| download | meson-696358957617dff59f40d5ff7befa9924982578c.zip meson-696358957617dff59f40d5ff7befa9924982578c.tar.gz meson-696358957617dff59f40d5ff7befa9924982578c.tar.bz2 | |
Merge pull request #6213 from mensinda/cmNameFix
cmake: Uniform target name handling and custom target fixes
Diffstat (limited to 'test cases')
4 files changed, 12 insertions, 10 deletions
diff --git a/test cases/cmake/2 advanced/installed_files.txt b/test cases/cmake/2 advanced/installed_files.txt index 8cbdcd7..4965cd1 100644 --- a/test cases/cmake/2 advanced/installed_files.txt +++ b/test cases/cmake/2 advanced/installed_files.txt @@ -1,4 +1,4 @@ -usr/?lib/libcmModLib?so -?cygwin:usr/lib/libcmModLib?implib -?!cygwin:usr/bin/libcmModLib?implib -usr/bin/testEXE?exe
\ No newline at end of file +usr/?lib/libcm_cmModLib?so +?cygwin:usr/lib/libcm_cmModLib?implib +?!cygwin:usr/bin/libcm_cmModLib?implib +usr/bin/cm_testEXE?exe diff --git a/test cases/cmake/3 advanced no dep/installed_files.txt b/test cases/cmake/3 advanced no dep/installed_files.txt index e16e27d..453c6c0 100644 --- a/test cases/cmake/3 advanced no dep/installed_files.txt +++ b/test cases/cmake/3 advanced no dep/installed_files.txt @@ -1,6 +1,6 @@ -usr/?lib/libcmModLib?so -?cygwin:usr/lib/libcmModLib?implib -?!cygwin:usr/bin/libcmModLib?implib -?msvc:usr/bin/cmModLib.pdb -?msvc:usr/bin/testEXE.pdb -usr/bin/testEXE?exe
\ No newline at end of file +usr/?lib/libcm_cmModLib?so +?cygwin:usr/lib/libcm_cmModLib?implib +?!cygwin:usr/bin/libcm_cmModLib?implib +?msvc:usr/bin/cm_cmModLib.pdb +?msvc:usr/bin/cm_testEXE.pdb +usr/bin/cm_testEXE?exe
\ No newline at end of file diff --git a/test cases/cmake/5 object library/subprojects/cmObjLib/CMakeLists.txt b/test cases/cmake/5 object library/subprojects/cmObjLib/CMakeLists.txt index ee9be47..a47fa59 100644 --- a/test cases/cmake/5 object library/subprojects/cmObjLib/CMakeLists.txt +++ b/test cases/cmake/5 object library/subprojects/cmObjLib/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.7) +project(cmObject) find_package(ZLIB REQUIRED) diff --git a/test cases/cmake/6 object library no dep/subprojects/cmObjLib/CMakeLists.txt b/test cases/cmake/6 object library no dep/subprojects/cmObjLib/CMakeLists.txt index 08c6a18..5e0b0b1 100644 --- a/test cases/cmake/6 object library no dep/subprojects/cmObjLib/CMakeLists.txt +++ b/test cases/cmake/6 object library no dep/subprojects/cmObjLib/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.7) +project(cmObject) add_library(lib_obj OBJECT libA.cpp libB.cpp) add_library(lib_sha SHARED $<TARGET_OBJECTS:lib_obj>) |