Skip to content
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

Jump to bottom

Add support for build with MinGW #46

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for build with MinGW #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19da7f2
Set minimum supported Windows version to 10 (Windows 10)
cwassmuth Apr 19, 2022
9af1956
Remove obsolete MinGW special cases
cwassmuth Apr 19, 2022
4c30bb6
Fix missing find_package_handle_standard_args for the "else" case
cwassmuth Apr 19, 2022
a703f8f
Remove unused mingw headers
cwassmuth Aug 29, 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
6 changes: 3 additions & 3 deletions cmake/FindLog4cplus.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ else ()

endif ()

# needed to use find_package_handle_standard_args
include(FindPackageHandleStandardArgs)

if (LOG4CPLUS_INCLUDE_DIR)
# set the correct variable name for the header directories
set(LOG4CPLUS_INCLUDE_DIRS ${LOG4CPLUS_INCLUDE_DIR})

# needed to use find_package_handle_standard_args
include(FindPackageHandleStandardArgs)

if (LOG4CPLUS_LIBRARY_RELEASE AND LOG4CPLUS_LIBRARY_DEBUG)
# set the libaries varible to use the release and debug versions
Expand Down
6 changes: 3 additions & 3 deletions cmake/FindMsgpack.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,13 @@ else ()

endif ()

# needed to use find_package_handle_standard_args
include(FindPackageHandleStandardArgs)

if (MSGPACK_INCLUDE_DIR)
# set the correct variable name for the header directories
set(MSGPACK_INCLUDE_DIRS ${MSGPACK_INCLUDE_DIR})

# needed to use find_package_handle_standard_args
include(FindPackageHandleStandardArgs)

if (MSGPACK_LIBRARY_RELEASE AND MSGPACK_LIBRARY_DEBUG)
# set the libaries varible to use the release and debug versions
find_package_handle_standard_args(MSGPACK DEFAULT_MSG MSGPACK_INCLUDE_DIR MSGPACK_LIBRARY_RELEASE MSGPACK_LIBRARY_DEBUG)
Expand Down
8 changes: 8 additions & 0 deletions example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,13 @@ foreach( SOURCEFILE ${EXAMPLE_SOURCES} )

# Add the necessary external library references
target_link_libraries( ${SOURCEFILE} anyrpc ${ASAN_LIBRARY} ${LOG4CPLUS_LIBRARIES} ${MSGPACK_LIBRARIES})

if (WIN32)
target_compile_definitions(${SOURCEFILE}
PRIVATE
WINVER=0x0A00
_WIN32_WINNT=0x0A00
)
endif ()
endforeach ()

6 changes: 1 addition & 5 deletions include/anyrpc/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@
#define ANYRPC_CONNECTION_H_

#if defined(ANYRPC_THREADING)
# if defined(__MINGW32__)
# include "internal/mingw.thread.h"
# else
# include <thread>
# endif // defined(__MINGW32__)
# include <thread>
#endif // defined(ANYRPC_THREADING)

#if defined(ANYRPC_REGEX)
Expand Down
185 changes: 0 additions & 185 deletions include/anyrpc/internal/mingw.condition_variable.h
View file
Open in desktop

This file was deleted.

Loading