@@ -292,11 +292,11 @@ if (WIN32)
292292        target_compile_options (
293293            mrdocs-core
294294            PUBLIC 
295-             /permissive-    # strict C++ 
296-             /W4             # enable all warnings 
297-             /MP              # multi-processor compilation 
298-             /EHs            # C++ Exception handling 
299-             $<$<CONFIG:Debug>:/Oy-> # Disable frame pointer omission 
295+             /permissive-                     # strict C++ 
296+             /W4                              # enable all warnings 
297+             $<$<CXX_COMPILER_ID: MSVC >: /MP>   # multi-processor compilation 
298+             /EHs                             # C++ Exception handling 
299+             $<$<CONFIG:Debug>:/Oy->          # Disable frame pointer omission 
300300        )
301301    endif ()
302302endif  ()
@@ -326,7 +326,6 @@ list(APPEND TOOL_SOURCES
326326        ${CMAKE_CURRENT_BINARY_DIR} /src/tool/PublicToolArgs.cpp)
327327
328328add_executable (mrdocs ${TOOL_SOURCES} )
329- target_compile_definitions (mrdocs PRIVATE  -DMRDOCS_TOOL)
330329
331330target_include_directories (mrdocs
332331    PUBLIC 
@@ -338,7 +337,6 @@ target_include_directories(mrdocs
338337    "${PROJECT_BINARY_DIR} /src" 
339338)
340339
341- target_compile_definitions (mrdocs PRIVATE  -DMRDOCS_TOOL)
342340target_link_libraries (mrdocs PUBLIC  mrdocs-core)
343341if  (MRDOCS_CLANG)
344342    target_compile_options (
@@ -529,9 +527,14 @@ if (MRDOCS_INSTALL)
529527    #------------------------------------------------- 
530528    install (TARGETS mrdocs-core
531529            EXPORT  mrdocs-targets
530+             RUNTIME_DEPENDENCIES
531+                 PRE_EXCLUDE_REGEXES "^api-ms-.*\\ .dll$"  "^ext-ms-.*\\ .dll$" 
532+                 POST_EXCLUDE_REGEXES ".*system32/.*\\ .dll$" 
532533            LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR} 
533534            ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR} 
534-             COMPONENT  development
535+                 COMPONENT  development
536+             RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR} 
537+             FRAMEWORK  DESTINATION  ${CMAKE_INSTALL_LIBDIR} 
535538            )
536539
537540    install (EXPORT mrdocs-targets
0 commit comments