cmake.patch 4.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127
  1. diff --git a/newton-4.00/CMakeLists.txt b/newton-4.00/CMakeLists.txt
  2. index c7f63370f..466bc9f72 100644
  3. --- a/newton-4.00/CMakeLists.txt
  4. +++ b/newton-4.00/CMakeLists.txt
  5. @@ -97,30 +97,6 @@ if(UNIX)
  6. endif ()
  7. if (MSVC)
  8. - if (PTR_SIZE EQUAL 8)
  9. - set(CMAKE_INSTALL_PREFIX "win64sdk" CACHE PATH "..." FORCE)
  10. - else()
  11. - set(CMAKE_INSTALL_PREFIX "win32sdk" CACHE PATH "..." FORCE)
  12. - endif ()
  13. -
  14. - if(NEWTON_STATIC_RUNTIME_LIBRARIES)
  15. - message ("link to static runtime libraries")
  16. - set(CMAKE_C_FLAGS_DEBUG "/MTd")
  17. - set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MT")
  18. - set(CMAKE_C_FLAGS_RELEASE "/MT")
  19. - set(CMAKE_CXX_FLAGS_DEBUG "/MTd")
  20. - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT")
  21. - set(CMAKE_CXX_FLAGS_RELEASE "/MT")
  22. - else()
  23. - message ("link to dynamic runtime libraries")
  24. - set(CMAKE_C_FLAGS_DEBUG "/MDd")
  25. - set(CMAKE_C_FLAGS_RELWITHDEBINFO "/MD")
  26. - set(CMAKE_C_FLAGS_RELEASE "/MD")
  27. - set(CMAKE_CXX_FLAGS_DEBUG "/MDd")
  28. - set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD")
  29. - set(CMAKE_CXX_FLAGS_RELEASE "/MD")
  30. - endif()
  31. -
  32. if(${CMAKE_VS_PLATFORM_NAME} STREQUAL "x64")
  33. message ("build 64 bit")
  34. elseif(${CMAKE_VS_PLATFORM_NAME} STREQUAL "Win32")
  35. diff --git a/newton-4.00/applications/ndSandbox/CMakeLists.txt b/newton-4.00/applications/ndSandbox/CMakeLists.txt
  36. index f399754d6..dbfb7d4ab 100644
  37. --- a/newton-4.00/applications/ndSandbox/CMakeLists.txt
  38. +++ b/newton-4.00/applications/ndSandbox/CMakeLists.txt
  39. @@ -96,8 +96,6 @@ if(MSVC OR MINGW)
  40. target_link_libraries (${projectName} glu32 opengl32)
  41. - target_link_options(${projectName} PUBLIC "/DEBUG")
  42. -
  43. if(CMAKE_VS_MSBUILD_COMMAND OR CMAKE_VS_DEVENV_COMMAND)
  44. set_target_properties(${projectName} PROPERTIES COMPILE_FLAGS "/YundSandboxStdafx.h")
  45. set_source_files_properties(ndSandboxStdafx.cpp PROPERTIES COMPILE_FLAGS "/YcndSandboxStdafx.h")
  46. diff --git a/newton-4.00/sdk/CMakeLists.txt b/newton-4.00/sdk/CMakeLists.txt
  47. index a2d501408..76ea3b175 100644
  48. --- a/newton-4.00/sdk/CMakeLists.txt
  49. +++ b/newton-4.00/sdk/CMakeLists.txt
  50. @@ -112,11 +112,6 @@ else()
  51. if (NEWTON_ENABLE_OPENCL_SOLVER)
  52. target_link_libraries (${projectName} ndSolverOpenCL)
  53. endif()
  54. -
  55. - if(MSVC OR MINGW)
  56. - target_link_options(${projectName} PUBLIC "/DEBUG")
  57. - endif()
  58. -
  59. else()
  60. add_library(${projectName} STATIC ${CPP_SOURCE})
  61. endif()
  62. diff --git a/newton-4.00/sdk/dCollision/CMakeLists.txt b/newton-4.00/sdk/dCollision/CMakeLists.txt
  63. index 78903dd0a..2e1d5be89 100644
  64. --- a/newton-4.00/sdk/dCollision/CMakeLists.txt
  65. +++ b/newton-4.00/sdk/dCollision/CMakeLists.txt
  66. @@ -31,10 +31,6 @@ endif(MSVC)
  67. if(NEWTON_BUILD_SHARED_LIBS)
  68. add_definitions(-D_D_COLLISION_EXPORT_DLL)
  69. add_library(${projectName} SHARED ${CPP_SOURCE})
  70. -
  71. - if(MSVC OR MINGW)
  72. - target_link_options(${projectName} PUBLIC "/DEBUG")
  73. - endif()
  74. else()
  75. add_library(${projectName} STATIC ${CPP_SOURCE})
  76. endif()
  77. diff --git a/newton-4.00/sdk/dCore/CMakeLists.txt b/newton-4.00/sdk/dCore/CMakeLists.txt
  78. index 2786e5838..7fc55b76b 100644
  79. --- a/newton-4.00/sdk/dCore/CMakeLists.txt
  80. +++ b/newton-4.00/sdk/dCore/CMakeLists.txt
  81. @@ -25,11 +25,6 @@ source_group(TREE "${CMAKE_CURRENT_SOURCE_DIR}/" FILES ${CPP_SOURCE})
  82. if(NEWTON_BUILD_SHARED_LIBS STREQUAL "ON")
  83. add_definitions(-D_D_CORE_EXPORT_DLL)
  84. add_library(${projectName} SHARED ${CPP_SOURCE})
  85. -
  86. - if(MSVC OR MINGW)
  87. - target_link_options(${projectName} PUBLIC "/DEBUG")
  88. - endif()
  89. -
  90. else()
  91. add_library(${projectName} STATIC ${CPP_SOURCE})
  92. endif()
  93. diff --git a/newton-4.00/sdk/dExtensions/dAvx2/CMakeLists.txt b/newton-4.00/sdk/dExtensions/dAvx2/CMakeLists.txt
  94. index eb6fc4bd5..97a366b77 100644
  95. --- a/newton-4.00/sdk/dExtensions/dAvx2/CMakeLists.txt
  96. +++ b/newton-4.00/sdk/dExtensions/dAvx2/CMakeLists.txt
  97. @@ -51,10 +51,6 @@ if(UNIX)
  98. add_library(${projectName} SHARED ${CPP_SOURCE})
  99. endif()
  100. -if(MSVC OR MINGW)
  101. - target_link_options(${projectName} PUBLIC "/DEBUG")
  102. -endif()
  103. -
  104. install(TARGETS ${projectName}
  105. LIBRARY DESTINATION lib
  106. ARCHIVE DESTINATION lib
  107. diff --git a/newton-4.00/sdk/dNewton/CMakeLists.txt b/newton-4.00/sdk/dNewton/CMakeLists.txt
  108. index 86ca89aca..6e2875b11 100644
  109. --- a/newton-4.00/sdk/dNewton/CMakeLists.txt
  110. +++ b/newton-4.00/sdk/dNewton/CMakeLists.txt
  111. @@ -82,12 +82,6 @@ endif()
  112. if(NEWTON_BUILD_SHARED_LIBS)
  113. add_definitions(-D_D_NEWTON_EXPORT_DLL)
  114. add_library(${projectName} SHARED ${CPP_SOURCE})
  115. -
  116. -
  117. - if(MSVC OR MINGW)
  118. - target_link_options(${projectName} PUBLIC "/DEBUG")
  119. - endif()
  120. -
  121. else()
  122. add_library(${projectName} STATIC ${CPP_SOURCE})
  123. endif()