@@ -84,13 +84,15 @@ if (BUILD_TESTING)
8484endif (BUILD_TESTING)
8585
8686macro(default_options_local name)
87+
8788 if (NOT CAF_FOUND)
8889 find_package(CAF COMPONENTS core io)
8990 endif (NOT CAF_FOUND)
9091
9192 find_package(spdlog CONFIG REQUIRED)
9293
9394 default_compile_options(${name} )
95+
9496 target_include_directories(${name}
9597 PUBLIC
9698 $<BUILD_INTERFACE :${ROOT_DIR} /include >
@@ -100,19 +102,27 @@ macro(default_options_local name)
100102 SYSTEM PUBLIC
101103 $<BUILD_INTERFACE :${ROOT_DIR} /extern /include >
102104 )
105+
103106 if (APPLE)
104- set_target_properties(${name}
105- PROPERTIES
106- LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /xSTUDIO.app/Contents/Frameworks "
107- INSTALL_RPATH "@executable_path/../Frameworks "
108- INSTALL_RPATH_USE_LINK_PATH TRUE
109- )
110- else( )
107+ set_target_properties(${name}
108+ PROPERTIES
109+ LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR} /xSTUDIO.app/Contents/Frameworks "
110+ INSTALL_RPATH "@executable_path/../Frameworks "
111+ INSTALL_RPATH_USE_LINK_PATH TRUE
112+ )
113+ elseif(UNIX )
111114 set_target_properties(${name}
112115 PROPERTIES
113116 LIBRARY_OUTPUT_DIRECTORY " ${CMAKE_BINARY_DIR} /bin/lib "
114117 )
118+ else()
119+ set_target_properties(${name}
120+ PROPERTIES
121+ LIBRARY_OUTPUT_DIRECTORY " ${CMAKE_BINARY_DIR} /bin "
122+ RUNTIME_OUTPUT_DIRECTORY " ${CMAKE_BINARY_DIR} /bin "
123+ )
115124 endif()
125+
116126endmacro()
117127
118128macro(default_options name)
@@ -203,7 +213,7 @@ macro(default_plugin_options name)
203213 add_custom_command(
204214 TARGET ${PROJECT_NAME}
205215 POST_BUILD
206- COMMAND ${CMAKE_COMMAND} -E copy " $<TARGET_FILE :${PROJECT_NAME} >" " ${CMAKE_CURRENT_BINARY_DIR} /plugin "
216+ COMMAND ${CMAKE_COMMAND} -E copy " $<TARGET_FILE :${PROJECT_NAME} >" " ${CMAKE_BINARY_DIR} /share/xstudio /plugin"
207217 )
208218 endif()
209219
@@ -227,9 +237,15 @@ macro(add_plugin_qml name _dir)
227237 foreach(DIR ${DIRS} )
228238 if(IS_DIRECTORY ${DIR} )
229239 cmake_path(GET DIR FILENAME dirname)
230- add_custom_command(TARGET ${name} _COPY_QML POST_BUILD
231- COMMAND ${CMAKE_COMMAND} -E
232- copy_directory ${DIR} ${CMAKE_BINARY_DIR} /bin/plugin/qml/${dirname} )
240+ if (WIN32)
241+ add_custom_command(TARGET ${name} _COPY_QML POST_BUILD
242+ COMMAND ${CMAKE_COMMAND} -E
243+ copy_directory ${DIR} ${CMAKE_BINARY_DIR} /share/xstudio/plugin/qml/${dirname} )
244+ else()
245+ add_custom_command(TARGET ${name} _COPY_QML POST_BUILD
246+ COMMAND ${CMAKE_COMMAND} -E
247+ copy_directory ${DIR} ${CMAKE_BINARY_DIR} /bin/plugin/qml/${dirname} )
248+ endif()
233249 install(DIRECTORY ${DIR} DESTINATION share/xstudio/plugin/qml)
234250 endif()
235251 endforeach()
@@ -504,9 +520,15 @@ macro(add_preference name path target)
504520
505521 else()
506522
507- add_custom_command(TARGET ${target} POST_BUILD
523+ if (WIN32)
524+ add_custom_command(TARGET ${target} POST_BUILD
525+ COMMAND ${CMAKE_COMMAND} -E copy ${path} /${name}
526+ ${CMAKE_BINARY_DIR} /share/xstudio/preference/${name} )
527+ else()
528+ add_custom_command(TARGET ${target} POST_BUILD
508529 COMMAND ${CMAKE_COMMAND} -E copy ${path} /${name}
509530 ${CMAKE_BINARY_DIR} /bin/preference/${name} )
531+ endif()
510532
511533 if(INSTALL_XSTUDIO)
512534 install(FILES
0 commit comments