@@ -300,11 +300,11 @@ if (WIN32)
300300        target_compile_options (
301301            mrdocs-core
302302            PUBLIC 
303-             /permissive-    # strict C++ 
304-             /W4             # enable all warnings 
305-             /MP              # multi-processor compilation 
306-             /EHs            # C++ Exception handling 
307-             $<$<CONFIG:Debug>:/Oy-> # Disable frame pointer omission 
303+             /permissive-                     # strict C++ 
304+             /W4                              # enable all warnings 
305+             $<$<CXX_COMPILER_ID: MSVC >: /MP>   # multi-processor compilation 
306+             /EHs                             # C++ Exception handling 
307+             $<$<CONFIG:Debug>:/Oy->          # Disable frame pointer omission 
308308        )
309309    endif ()
310310endif  ()
@@ -334,7 +334,6 @@ list(APPEND TOOL_SOURCES
334334        ${CMAKE_CURRENT_BINARY_DIR} /src/tool/PublicToolArgs.cpp)
335335
336336add_executable (mrdocs ${TOOL_SOURCES} )
337- target_compile_definitions (mrdocs PRIVATE  -DMRDOCS_TOOL)
338337
339338target_include_directories (mrdocs
340339    PUBLIC 
@@ -346,7 +345,6 @@ target_include_directories(mrdocs
346345    "${PROJECT_BINARY_DIR} /src" 
347346)
348347
349- target_compile_definitions (mrdocs PRIVATE  -DMRDOCS_TOOL)
350348target_link_libraries (mrdocs PUBLIC  mrdocs-core)
351349if  (MRDOCS_CLANG)
352350    target_compile_options (
@@ -537,9 +535,14 @@ if (MRDOCS_INSTALL)
537535    #------------------------------------------------- 
538536    install (TARGETS mrdocs-core
539537            EXPORT  mrdocs-targets
538+             RUNTIME_DEPENDENCIES
539+                 PRE_EXCLUDE_REGEXES "^api-ms-.*\\ .dll$"  "^ext-ms-.*\\ .dll$" 
540+                 POST_EXCLUDE_REGEXES ".*system32/.*\\ .dll$" 
540541            LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR} 
541542            ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR} 
542-             COMPONENT  development
543+                 COMPONENT  development
544+             RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR} 
545+             FRAMEWORK  DESTINATION  ${CMAKE_INSTALL_LIBDIR} 
543546            )
544547
545548    install (EXPORT mrdocs-targets
0 commit comments