From 10f435a58f97a71f6718bfdd0cacb72175a906ef Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 23 Aug 2023 11:20:08 -0400 Subject: Tests: Simplify nested if conditions in Complex tests --- Tests/Complex/Executable/CMakeLists.txt | 8 ++------ Tests/Complex/Library/CMakeLists.txt | 16 +++------------- Tests/ComplexOneConfig/Executable/CMakeLists.txt | 8 ++------ Tests/ComplexOneConfig/Library/CMakeLists.txt | 16 +++------------- 4 files changed, 10 insertions(+), 38 deletions(-) diff --git a/Tests/Complex/Executable/CMakeLists.txt b/Tests/Complex/Executable/CMakeLists.txt index 2a79629..ceb6b54 100644 --- a/Tests/Complex/Executable/CMakeLists.txt +++ b/Tests/Complex/Executable/CMakeLists.txt @@ -45,12 +45,8 @@ add_executable(complex.file complex.file.cxx complex_nobuild.cxx if (UNIX) target_link_libraries(complex ${CMAKE_DL_LIBS}) -else() - if (NOT BORLAND) - if(NOT MINGW) - target_link_libraries(complex rpcrt4.lib) - endif() - endif() +elseif(NOT BORLAND AND NOT MINGW) + target_link_libraries(complex rpcrt4.lib) endif () # Test linking to static lib when a shared lib has the same name. diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt index df874ef..9f2d5e1 100644 --- a/Tests/Complex/Library/CMakeLists.txt +++ b/Tests/Complex/Library/CMakeLists.txt @@ -23,19 +23,9 @@ set(LibrarySources ${LibrarySources} remove(LibrarySources create_file.cxx GENERATED nonexisting_file) add_library(CMakeTestLibrary ${LibrarySources}) -if(WIN32) - if(NOT CYGWIN) - if(NOT BORLAND) - if(NOT MINGW) - target_link_libraries(CMakeTestLibrary - debug - user32.lib) - target_link_libraries(CMakeTestLibrary - optimized - kernel32.lib) - endif() - endif() - endif() +if(WIN32 AND NOT CYGWIN AND NOT BORLAND AND NOT MINGW) + target_link_libraries(CMakeTestLibrary debug user32.lib) + target_link_libraries(CMakeTestLibrary optimized kernel32.lib) endif() # diff --git a/Tests/ComplexOneConfig/Executable/CMakeLists.txt b/Tests/ComplexOneConfig/Executable/CMakeLists.txt index f935aed..ec76e83 100644 --- a/Tests/ComplexOneConfig/Executable/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Executable/CMakeLists.txt @@ -45,12 +45,8 @@ add_executable(complex.file complex.file.cxx complex_nobuild.cxx if (UNIX) target_link_libraries(complex ${CMAKE_DL_LIBS}) -else() - if (NOT BORLAND) - if(NOT MINGW) - target_link_libraries(complex rpcrt4.lib) - endif() - endif() +elseif(NOT BORLAND AND NOT MINGW) + target_link_libraries(complex rpcrt4.lib) endif () # Test linking to static lib when a shared lib has the same name. diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt index df874ef..9f2d5e1 100644 --- a/Tests/ComplexOneConfig/Library/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt @@ -23,19 +23,9 @@ set(LibrarySources ${LibrarySources} remove(LibrarySources create_file.cxx GENERATED nonexisting_file) add_library(CMakeTestLibrary ${LibrarySources}) -if(WIN32) - if(NOT CYGWIN) - if(NOT BORLAND) - if(NOT MINGW) - target_link_libraries(CMakeTestLibrary - debug - user32.lib) - target_link_libraries(CMakeTestLibrary - optimized - kernel32.lib) - endif() - endif() - endif() +if(WIN32 AND NOT CYGWIN AND NOT BORLAND AND NOT MINGW) + target_link_libraries(CMakeTestLibrary debug user32.lib) + target_link_libraries(CMakeTestLibrary optimized kernel32.lib) endif() # -- cgit v0.12