diff options
| author | Miodrag Milanović <mmicko@gmail.com> | 2020-05-14 19:07:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 19:07:49 +0200 |
| commit | 34bc42162656011ecb7092cf3c762eb35ec99e23 (patch) | |
| tree | 16fe8c9b7ee60c66b0316acd71a2d38112027baf | |
| parent | 2692c6f6cce41d22847058c85715e8822feb9b87 (diff) | |
| parent | 7b84ed94b5a780e912b4e0af32cabe6bfdf2d6ae (diff) | |
| download | nextpnr-34bc42162656011ecb7092cf3c762eb35ec99e23.tar.gz nextpnr-34bc42162656011ecb7092cf3c762eb35ec99e23.tar.bz2 nextpnr-34bc42162656011ecb7092cf3c762eb35ec99e23.zip | |
Merge pull request #439 from edbordin/master
Minor patch for MinGW build
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c1d9f1a6..9bd85194 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,9 +18,11 @@ set(link_param "") if (STATIC_BUILD) set(Boost_USE_STATIC_LIBS ON) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND MSVC) - set(CMAKE_CXX_FLAGS_RELEASE "/MT") - set(CMAKE_CXX_FLAGS_DEBUG "/MTd") + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + if (MSVC) + set(CMAKE_CXX_FLAGS_RELEASE "/MT") + set(CMAKE_CXX_FLAGS_DEBUG "/MTd") + endif() if (BUILD_PYTHON) add_definitions(-DBOOST_PYTHON_STATIC_LIB) endif() @@ -285,7 +287,7 @@ foreach (family ${ARCH}) if (STATIC_BUILD) target_link_libraries(${target} LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ${EXPAT_LIBRARIES}) if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND MSVC) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") else() target_link_libraries(${target} LINK_PUBLIC -lutil) endif() |