From 23a0e3ed445a03d3a82cf2b677ba15c2a5b3d8a0 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 7 Apr 2022 10:58:34 +0200 Subject: Switched parts of cmake tree for MSVC --- CMakeLists.txt | 4 +++- contrib/CMakeLists.txt | 14 ++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4eac4e9..fdb33d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,9 @@ add_subdirectory(data) add_subdirectory(Datafile) add_subdirectory(DefinitionEx) add_subdirectory(FoundationEx) -# add_subdirectory(Magic2) # TODO: AFX/MFC will be useless, port it to e.g., Qt right away. +if(MSVC) + add_subdirectory(Magic2) +endif() add_subdirectory(NetEx) add_subdirectory(Starserver) add_subdirectory(StarsEx) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 2cd9971..6a1a89b 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -8,9 +8,11 @@ install( RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX} ) -foreach(LIB IN ITEMS "libstdc++-6.dll" "libwinpthread-1.dll" "libgcc_s_dw2-1.dll") - find_file(LIBRARY_${LIB} ${LIB} PATHS ${CMAKE_FIND_ROOT_PATH}/bin) - if(LIBRARY_${LIB}) - install(PROGRAMS ${LIBRARY_${LIB}} DESTINATION ${CMAKE_INSTALL_PREFIX}) - endif() -endforeach() +if(NOT MSVC) + foreach(LIB IN ITEMS "libstdc++-6.dll" "libwinpthread-1.dll" "libgcc_s_dw2-1.dll") + find_file(LIBRARY_${LIB} ${LIB} PATHS ${CMAKE_FIND_ROOT_PATH}/bin) + if(LIBRARY_${LIB}) + install(PROGRAMS ${LIBRARY_${LIB}} DESTINATION ${CMAKE_INSTALL_PREFIX}) + endif() + endforeach() +endif() -- cgit v1.1