diff options
author | AchimTuran <mail@achim-turan.de> | 2016-05-26 07:07:16 +0200 |
---|---|---|
committer | AchimTuran <mail@achim-turan.de> | 2016-05-26 07:07:16 +0200 |
commit | 8ecf586ca80dfde11ef304b90ded3b660c4e97d7 (patch) | |
tree | 8f053c44fc4844e796f21244c3c61ac1072b5074 /project | |
parent | 17f5a53e5cc40738fce23e5f20af83b7f33b80b3 (diff) |
[cmake][Windows] Fix wrong output directory of add-on callback libraries for Windows
Diffstat (limited to 'project')
-rw-r--r-- | project/cmake/scripts/windows/Macros.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/project/cmake/scripts/windows/Macros.cmake b/project/cmake/scripts/windows/Macros.cmake index 9275c53f5f..f4cef0e560 100644 --- a/project/cmake/scripts/windows/Macros.cmake +++ b/project/cmake/scripts/windows/Macros.cmake @@ -14,9 +14,15 @@ function(core_link_library lib wraplib) endforeach() add_library(wrap_${lib} SHARED ${SOURCES_ABS}) - set_target_properties(wrap_${lib} PROPERTIES OUTPUT_NAME ${wraplib}) + set_target_properties(wrap_${lib} PROPERTIES OUTPUT_NAME lib${lib}) target_include_directories(wrap_${lib} PRIVATE ${INCLUDES}) target_compile_definitions(wrap_${lib} PRIVATE ${DEFINITIONS}) + + if(MSVC) + string(REPLACE "/lib${lib}" "" libdir ${wraplib}) + set_target_properties(wrap_${lib} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/${libdir}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/${libdir}") + endif() endif() endfunction() |