Просмотр исходного кода

Fixed MSVC executable copy step when path has spaces.
Fixed MinGW warning of unrecognized option when compiling C files.

Lasse Öörni 13 лет назад
Родитель
Сommit
24dc5ed707
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      CMakeLists.txt

+ 3 - 3
CMakeLists.txt

@@ -74,7 +74,7 @@ elseif (NOT IOS)
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse")
     endif ()
     if (WIN32)
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libstdc++ -static-libgcc")
+        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc")
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++ -static-libgcc")
     endif ()
 endif ()
@@ -97,8 +97,8 @@ endmacro ()
 # Macro for exe finalization
 macro (finalize_exe)
     if (MSVC)
-        add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different $(TARGETPATH) ${PROJECT_BINARY_DIR}/Bin)
-        add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different $(TARGETDIR)$(TARGETNAME).pdb ${PROJECT_BINARY_DIR}/Bin)
+        add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different \"$(TARGETPATH)\" ${PROJECT_BINARY_DIR}/Bin)
+        add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different \"$(TARGETDIR)$(TARGETNAME).pdb\" ${PROJECT_BINARY_DIR}/Bin)
     elseif (NOT IOS)
         get_target_property (EXECUTABLE_NAME ${TARGET_NAME} LOCATION)
         add_custom_command (TARGET ${TARGET_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${EXECUTABLE_NAME} ${PROJECT_BINARY_DIR}/Bin)