diff --git a/.cmake/Modules/Subprojects.cmake b/.cmake/Modules/Subprojects.cmake index 7e79603..3bdb14f 100644 --- a/.cmake/Modules/Subprojects.cmake +++ b/.cmake/Modules/Subprojects.cmake @@ -44,6 +44,9 @@ function (cr_add_subproject _NAME) if (NOT ARGS_GENERATOR) set (ARGS_GENERATOR ${CMAKE_GENERATOR}) endif () + if (CMAKE_TOOLCHAIN_FILE) + set (ARGS_OPTS ${ARGS_OPTS} "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}") + endif () set (build_cmds CONFIGURE_COMMAND ${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=${install_prefix} @@ -78,7 +81,7 @@ function (cr_add_subproject _NAME) if (WIN32) set ("${_NAME}_SHARED_LIB" "${install_prefix}/lib/${_NAME}.dll" PARENT_SCOPE) - if (ARGS_GENERATOR MATCHES "(MSYS|MinGW) Makefiles") + if (ARGS_GENERATOR MATCHES "(Unix|MSYS|MinGW) Makefiles") set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/lib${_NAME}.a" PARENT_SCOPE) else () set ("${_NAME}_STATIC_LIB" "${install_prefix}/lib/${_NAME}.lib" PARENT_SCOPE) diff --git a/samples/timeout.c b/samples/timeout.c index db37bf0..6876477 100644 --- a/samples/timeout.c +++ b/samples/timeout.c @@ -1,7 +1,7 @@ #include #ifdef _WIN32 -# include +# include # define sleep(x) Sleep(x * 1000) #else # include diff --git a/src/compat/time.c b/src/compat/time.c index 63c4246..18dc07e 100644 --- a/src/compat/time.c +++ b/src/compat/time.c @@ -28,7 +28,7 @@ extern __attribute__ ((weak)) int clock_gettime(clockid_t, struct timespec *); #elif defined(_WIN32) || defined(__CYGWIN__) # define VC_EXTRALEAN # define WIN32_LEAN_AND_MEAN -# include +# include #endif bool can_measure_time(void) {