Browse Source

Tests: Simplify nested if conditions in Complex tests

Brad King 2 years ago
parent
commit
10f435a58f

+ 2 - 6
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.

+ 3 - 13
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()
 
 #

+ 2 - 6
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.

+ 3 - 13
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()
 
 #