Mercurial > malikania
diff cmake/function/MalikaniaDefineLibrary.cmake @ 200:0a285d62ace7
windows: initial VS2017 support
While here, do some cleanup in CMake files for a better hierarchy.
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Wed, 28 Nov 2018 22:01:55 +0100 |
| parents | 9ef01392a7f1 |
| children | d01d694ae544 |
line wrap: on
line diff
--- a/cmake/function/MalikaniaDefineLibrary.cmake Tue Oct 30 13:21:55 2018 +0100 +++ b/cmake/function/MalikaniaDefineLibrary.cmake Wed Nov 28 22:01:55 2018 +0100 @@ -30,12 +30,9 @@ # LIBRARIES (Optional) List of libraries to link against # ) # -# Create a shared library. Follow the same specification as malikania_define_executable. -# However, additional PRIVATE_INCLUDES and PUBLIC_INCLUDES are available. +# Create a library and install it. # -include(CMakeParseArguments) - include(${CMAKE_CURRENT_LIST_DIR}/MalikaniaBuildAssets.cmake) function(malikania_define_library) @@ -68,23 +65,4 @@ ${LIB_PUBLIC_INCLUDES} ) target_compile_definitions(${LIB_TARGET} PRIVATE ${LIB_FLAGS}) - - # - # Move the library into fakeroot/bin/ directory for Windows and other - # DLL platforms so executables can be ran directly. - # - set_target_properties( - ${LIB_TARGET} - PROPERTIES - PREFIX "" - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin - ) - foreach (c ${CMAKE_CONFIGURATION_TYPES}) - string(TOUPPER ${c} cu) - set_target_properties( - ${LIB_TARGET} - PROPERTIES - RUNTIME_OUTPUT_DIRECTORY_${cu} ${CMAKE_BINARY_DIR}/bin/${c} - ) - endforeach () endfunction()