diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d273f0..0314ed2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,9 @@ project(LangulusFractalloc # Check if this project is built as standalone, or a part of something else if(PROJECT_IS_TOP_LEVEL OR NOT LANGULUS) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/lib) + include(LangulusUtilities.cmake) # Always enable the managed memory feature diff --git a/LangulusUtilities.cmake b/LangulusUtilities.cmake index b8dc747..8481116 100644 --- a/LangulusUtilities.cmake +++ b/LangulusUtilities.cmake @@ -40,14 +40,4 @@ function(fetch_external_module NAME GIT_REPOSITORY REPO GIT_TAG TAG) string(TOLOWER ${NAME} LOWERCASE_NAME) set(${NAME}_SOURCE_DIR "${${LOWERCASE_NAME}_SOURCE_DIR}" CACHE INTERNAL "") set(${NAME}_BINARY_DIR "${${LOWERCASE_NAME}_BINARY_DIR}" CACHE INTERNAL "") -endfunction() - -function(langulus_copy_dlls TARGET ON THIS) - if(WIN32 AND LANGULUS_SHARED_LIBRARIES) - add_custom_command( - TARGET ${THIS} POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy "$" "$" - COMMAND_EXPAND_LISTS - ) - endif() endfunction() \ No newline at end of file diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 779cd21..e5938be 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,6 +14,4 @@ target_link_libraries(LangulusFractallocTest add_test( NAME LangulusFractallocTest COMMAND LangulusFractallocTest -) - -langulus_copy_dlls(LangulusFractallocTest ON LangulusFractallocTest) +) \ No newline at end of file