diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-11-20 17:41:24 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-11-20 17:44:48 +0100 |
| commit | 560c4f7f964a9e754b603686c13c781e65581b39 (patch) | |
| tree | 85348879bd8757f25fff58d514da15678d463c19 /test cases | |
| parent | 5920344b9283a55939ef322ca39fdd70f5aafd31 (diff) | |
| download | meson-560c4f7f964a9e754b603686c13c781e65581b39.zip meson-560c4f7f964a9e754b603686c13c781e65581b39.tar.gz meson-560c4f7f964a9e754b603686c13c781e65581b39.tar.bz2 | |
cmake: Uniform target name handling
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>) |