echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tests: Simplify nested if conditions in Complex tests

Browse Source
This commit is contained in:
Brad King 2023-08-23 11:20:08 -04:00
parent 9575e6f57b
commit 10f435a58f
4 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/Complex/Executable/CMakeLists.txt
View File

@ -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.

16
Tests/Complex/Library/CMakeLists.txt
View File

@ -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()
#

8
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@ -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.

16
Tests/ComplexOneConfig/Library/CMakeLists.txt
View File

@ -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()
#