Remove debug postfix from ACE build for MSVC

acidmanifesto · Mar 13, 2020 · 141f250 · 141f250
1 parent 9224514
commit 141f250
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/3rd_party/CMakeLists.txt b/3rd_party/CMakeLists.txt
@@ -7,7 +7,7 @@ if(BUILD_COX_MAP_VIEWER)
 else()
 endif()
 include(ExternalProject_ACE.cmake)
-if(MINGW) # ERICEDIT: If the OS is Windows:
+if(MINGW OR MSVC) # ERICEDIT: If the OS is Windows:
     add_custom_target( # ERICEDIT: Add a target that depends on authserver.
         libace ALL
         DEPENDS ace_IMP

diff --git a/3rd_party/ExternalProject_ACE.cmake b/3rd_party/ExternalProject_ACE.cmake
@@ -17,10 +17,10 @@ add_dependencies(ace_IMP ACE_BUILD)
 SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_LOCATION ${ace_LIBRARY_SHARED} )
 SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_IMPLIB ${ace_LIBRARY_IMP} )
 
-if(MSVC)
-    SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${ace_LIBRARY_SHARED_D} )
-    SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${ace_LIBRARY_IMP_D} )
-endif()
+#if(MSVC)
+#    SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${ace_LIBRARY_SHARED_D} )
+#    SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${ace_LIBRARY_IMP_D} )
+#endif()
 
 set_property(TARGET ace_IMP APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS ACE_HAS_DLL=1)
 set_property(TARGET ace_IMP APPEND PROPERTY INTERFACE_LINK_LIBRARIES Threads::Threads)

diff --git a/3rd_party/naked_ace.tgz b/3rd_party/naked_ace.tgz