dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-07 00:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Enable missing Objective C/C++ tests

Browse Source 
Some test cases added by commit 80f120a85f (Languages: Add support for
Objective-C, 2019-09-13, v3.16.0-rc1~44^2~3) have never actually been
run because the condition to enable them is never true.  Fix the
condition and fix the tests to pass.
This commit is contained in:
Brad King
2019-12-19 11:38:53 -05:00
parent 10fea25139
commit 2b6c2e55e7
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/CMakeOnly/CMakeLists.txt
View File

@@ -31,12 +31,9 @@ add_CMakeOnly_test(CheckStructHasMember)
add_CMakeOnly_test(CompilerIdC) add_CMakeOnly_test(CompilerIdC)
add_CMakeOnly_test(CompilerIdCXX) add_CMakeOnly_test(CompilerIdCXX)
if(CMAKE_OBJC_COMPILER) if (APPLE AND CMAKE_C_COMPILER_ID MATCHES "Clang|GNU")
add_CMakeOnly_test(CompilerIdOBJC) add_CMakeOnly_test(CompilerIdOBJC)
add_CMakeOnly_test(CheckOBJCCompilerFlag) add_CMakeOnly_test(CheckOBJCCompilerFlag)
endif()
if(CMAKE_OBJCXX_COMPILER)
add_CMakeOnly_test(CompilerIdOBJCXX) add_CMakeOnly_test(CompilerIdOBJCXX)
add_CMakeOnly_test(CheckOBJCXXCompilerFlag) add_CMakeOnly_test(CheckOBJCXXCompilerFlag)
endif() endif()

18
Tests/CMakeOnly/CheckOBJCCompilerFlag/CMakeLists.txt
View File

@@ -1,17 +1,7 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 3.16)
project(CheckOBJCCompilerFlag OBJC)
project(CheckOBJCCompilerFlag)
include(CheckOBJCCompilerFlag) include(CheckOBJCCompilerFlag)
check_objc_compiler_flag(-DFOO HAS_COMPILER_FLAG)
if(CMAKE_COMPILER_IS_GNUOBJC)
set(COMPILER_FLAG -fobjc-direct-dispatch)
else()
set(COMPILER_FLAG -fobjc-gc)
endif()
CHECK_OBJC_COMPILER_FLAGS(${COMPILER_FLAG} HAS_COMPILER_FLAG)
if(NOT HAS_COMPILER_FLAG) if(NOT HAS_COMPILER_FLAG)
message(SEND_ERROR "Test fail: HAS_COMPILER_FLAG: ${COMPILER_FLAG}") message(SEND_ERROR "Test fail: HAS_COMPILER_FLAG: ${COMPILER_FLAG}")
endif endif()

16
Tests/CMakeOnly/CheckOBJCXXCompilerFlag/CMakeLists.txt
View File

@@ -1,17 +1,7 @@
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 3.16)
project(CheckOBJCXXCompilerFlag OBJCXX)
project(CheckOBJCXXCompilerFlag)
include(CheckOBJCXXCompilerFlag) include(CheckOBJCXXCompilerFlag)
check_objcxx_compiler_flag(-DFOO HAS_COMPILER_FLAG)
if(CMAKE_COMPILER_IS_GNUOBJCXX)
set(COMPILER_FLAG -fobjc-direct-dispatch)
else()
set(COMPILER_FLAG -fobjc-gc)
endif()
CHECK_OBJCXX_COMPILER_FLAGS(${COMPILER_FLAG} HAS_COMPILER_FLAG)
if(NOT HAS_COMPILER_FLAG) if(NOT HAS_COMPILER_FLAG)
message(SEND_ERROR "Test fail: HAS_COMPILER_FLAG: ${COMPILER_FLAG}") message(SEND_ERROR "Test fail: HAS_COMPILER_FLAG: ${COMPILER_FLAG}")
endif() endif()