diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index 7d3f88d..576a28c 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -453,7 +453,7 @@ macro(wx_add_library name) # configure puts the .dll in the bin directory set(runtime_dir "bin") else() - set(runtime_dir "lib") + set(runtime_dir "bin") endif() wx_install(TARGETS ${name} EXPORT wxWidgetsTargets diff --git a/build/cmake/init.cmake b/build/cmake/init.cmake index e76dff6..eb4edc0 100644 --- a/build/cmake/init.cmake +++ b/build/cmake/init.cmake @@ -156,7 +156,7 @@ if(WIN32) endif() endif() -if(WIN32_MSVC_NAMING) +if(0) if(wxBUILD_SHARED) set(lib_suffix "_dll") else() diff --git a/build/cmake/install.cmake b/build/cmake/install.cmake index 384c683..a662a48 100644 --- a/build/cmake/install.cmake +++ b/build/cmake/install.cmake @@ -41,7 +41,7 @@ else() install(DIRECTORY DESTINATION "bin") install(CODE "execute_process( \ - COMMAND ${CMAKE_COMMAND} -E create_symlink \ + COMMAND ${CMAKE_COMMAND} -E copy \ \"${CMAKE_INSTALL_PREFIX}/lib/wx/config/${wxBUILD_FILE_ID}\" \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wx-config\" \ )" diff --git a/build/cmake/utils/CMakeLists.txt b/build/cmake/utils/CMakeLists.txt index dbed8cc..f1da8e3 100644 --- a/build/cmake/utils/CMakeLists.txt +++ b/build/cmake/utils/CMakeLists.txt @@ -39,7 +39,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}/bin/${wxrc_output_name}${EXE_SUFFIX}\" \ \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/wxrc${EXE_SUFFIX}\" \ )"