diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index 4ed7b264ef..195d776aeb 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -201,11 +201,11 @@ endif() wx_get_install_dir(include) if(WIN32_MSVC_NAMING) if(wxBUILD_SHARED) - set(lib_suffix "_dll") + # set(lib_suffix "_dll") else() - set(lib_suffix "_lib") + # set(lib_suffix "_lib") endif() - set(wxPLATFORM_LIB_DIR "${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}${lib_suffix}") + # set(wxPLATFORM_LIB_DIR "${wxCOMPILER_PREFIX}${wxARCH_SUFFIX}${lib_suffix}") set(wxINSTALL_INCLUDE_DIR "${include_dir}") else() wx_get_flavour(lib_flavour "-") diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake index cbbefdebe9..8f2759d5ad 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake @@ -66,7 +66,7 @@ else() wx_get_install_platform_dir(runtime) install(DIRECTORY DESTINATION "${runtime_dir}") install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ \"${CMAKE_INSTALL_PREFIX}/${library_dir}/wx/config/${wxBUILD_FILE_ID}\" \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${runtime_dir}/wx-config\" \ )" diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt index 608351ac42..d8110f9148 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt @@ -40,7 +40,7 @@ if(wxUSE_XRC) # Don't use wx_install() here to preserve escaping. install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ \"${CMAKE_INSTALL_PREFIX}/${runtime_dir}/${wxrc_output_name}${EXE_SUFFIX}\" \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${runtime_dir}/wxrc${EXE_SUFFIX}\" \ )"