aboutsummaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4fa8f511..21133e3d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,9 +36,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()
@@ -309,7 +311,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()