Skip to content

Using cmake's MINGW variable to detect proper ABI #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarkCallow merged 2 commits into from
May 23, 2022
Merged

Using cmake's MINGW variable to detect proper ABI #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fb97bc
Using internal cmake MINGW variable to make sure that clang + mingw l…
Honeybunch May 22, 2022
d2868b2
Making pthreads detection on Windows more robust
Honeybunch May 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ macro(commom_lib_settings lib write)
# The generator automatically sets the needed VCLinker
# option when a .def file is seen in sources.
# The def files that we add have a different syntax depending on the ABI
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
if(MINGW)
target_sources(
${lib}
PRIVATE
Expand Down Expand Up @@ -375,6 +375,15 @@ macro(commom_lib_settings lib write)
# generators (like Visual Studio) to take the exact path and not
# change it.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${KTX_BUILD_DIR}/$<CONFIG>>)

if(MINGW)
# Check if the Threads package is provided; if using Mingw it MIGHT be
find_package(Threads)
if(Threads_FOUND)
target_compile_definitions(ktx PRIVATE WIN32_HAS_PTHREADS)
target_link_libraries(ktx PRIVATE Threads::Threads)
endif()
endif()

elseif(APPLE)
if(KTX_EMBED_BITCODE)
Expand Down
2 changes: 1 addition & 1 deletion lib/astc_encode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#include "astc-encoder/Source/astcenc.h"

// Provide pthreads support on windows
#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
#if defined(_WIN32) && !defined(WIN32_HAS_PTHREADS)

#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
Expand Down