mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-23 22:58:37 -05:00
Merge topic 'posix_c'
e1adddc74eRunCMake/CXXModules/NoCXX20: Force older standard3f7ebf9354RunCMake/CTestTimeout: Include sched.h for pid_t8eb8d16c19cmSystemTools: Fix unsetenv() fallback324ca5b489Tests/CTestTestFdSetSize: Support plain POSIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7408
This commit is contained in:
@@ -1501,8 +1501,7 @@ std::string cmSystemTools::RelativeIfUnder(std::string const& top,
|
||||
bool cmSystemTools::UnsetEnv(const char* value)
|
||||
{
|
||||
# if !defined(HAVE_UNSETENV)
|
||||
std::string var = cmStrCat(value, '=');
|
||||
return cmSystemTools::PutEnv(var);
|
||||
return cmSystemTools::UnPutEnv(value);
|
||||
# else
|
||||
unsetenv(value);
|
||||
return true;
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
#if defined(_WIN32)
|
||||
# include <windows.h>
|
||||
#else
|
||||
#elif _XOPEN_SOURCE >= 500 || defined(_ALL_SOURCE)
|
||||
# include <unistd.h>
|
||||
#else
|
||||
# include <time.h>
|
||||
|
||||
# include <sys/select.h>
|
||||
#endif
|
||||
|
||||
/* sleeps for 0.1 second */
|
||||
@@ -9,8 +13,14 @@ int main(int argc, char** argv)
|
||||
{
|
||||
#if defined(_WIN32)
|
||||
Sleep(100);
|
||||
#else
|
||||
#elif _XOPEN_SOURCE >= 500 || defined(_ALL_SOURCE)
|
||||
usleep(100 * 1000);
|
||||
#else
|
||||
struct timeval tv;
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 100 * 1000;
|
||||
|
||||
select(0, NULL, NULL, NULL, &tv);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#if defined(_WIN32)
|
||||
# include <windows.h>
|
||||
#else
|
||||
# include <sched.h>
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ target_sources(nocxx20
|
||||
PUBLIC
|
||||
FILE_SET fs TYPE CXX_MODULES FILES
|
||||
sources/module.cxx)
|
||||
target_compile_features(nocxx20
|
||||
PRIVATE
|
||||
cxx_std_17)
|
||||
set_target_properties(nocxx20
|
||||
PROPERTIES
|
||||
CXX_STANDARD 17
|
||||
CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
Reference in New Issue
Block a user