diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-03-05 16:26:42 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-03-05 16:26:42 +0000 |
| commit | a515d18c3fe6097445f9e5817a5a6576ca205a40 (patch) | |
| tree | b1b861c1e1d6a051c8e3fd5848ebd2641c971a28 /Graphics | |
| parent | Another attempt to fix appveyor.yml (diff) | |
| download | DiligentCore-a515d18c3fe6097445f9e5817a5a6576ca205a40.tar.gz DiligentCore-a515d18c3fe6097445f9e5817a5a6576ca205a40.zip | |
Enabled custom build configuration
Diffstat (limited to 'Graphics')
| -rw-r--r-- | Graphics/GraphicsEngineD3D11/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 10 |
3 files changed, 8 insertions, 18 deletions
diff --git a/Graphics/GraphicsEngineD3D11/CMakeLists.txt b/Graphics/GraphicsEngineD3D11/CMakeLists.txt index 16f62cf6..02178d07 100644 --- a/Graphics/GraphicsEngineD3D11/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D11/CMakeLists.txt @@ -94,12 +94,8 @@ add_library(GraphicsEngineD3D11-shared SHARED readme.md ) -set_target_properties(GraphicsEngineD3D11-shared PROPERTIES - OUTPUT_NAME_DEBUG GraphicsEngineD3D11${DLL_DBG_SUFFIX} - OUTPUT_NAME_RELEASE GraphicsEngineD3D11${DLL_REL_SUFFIX} - OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineD3D11${DLL_REL_SUFFIX} - OUTPUT_NAME_MINSIZEREL GraphicsEngineD3D11${DLL_REL_SUFFIX} -) +# Set output name to GraphicsEngineD3D11_{32|64}{r|d} +set_dll_output_name(GraphicsEngineD3D11-shared GraphicsEngineD3D11) set_common_target_properties(GraphicsEngineD3D11-shared) set_common_target_properties(GraphicsEngineD3D11-static) diff --git a/Graphics/GraphicsEngineD3D12/CMakeLists.txt b/Graphics/GraphicsEngineD3D12/CMakeLists.txt index 850bec5c..d124c353 100644 --- a/Graphics/GraphicsEngineD3D12/CMakeLists.txt +++ b/Graphics/GraphicsEngineD3D12/CMakeLists.txt @@ -153,12 +153,8 @@ target_link_libraries(GraphicsEngineD3D12-static PRIVATE ${PRIVATE_DEPENDENCIES} target_link_libraries(GraphicsEngineD3D12-shared PRIVATE ${PRIVATE_DEPENDENCIES} PUBLIC ${PUBLIC_DEPENDENCIES}) target_compile_definitions(GraphicsEngineD3D12-shared PUBLIC ENGINE_DLL=1) -set_target_properties(GraphicsEngineD3D12-shared PROPERTIES - OUTPUT_NAME_DEBUG GraphicsEngineD3D12${DLL_DBG_SUFFIX} - OUTPUT_NAME_RELEASE GraphicsEngineD3D12${DLL_REL_SUFFIX} - OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineD3D12${DLL_REL_SUFFIX} - OUTPUT_NAME_MINSIZEREL GraphicsEngineD3D12${DLL_REL_SUFFIX} -) +# Set output name to GraphicsEngineD3D12_{32|64}{r|d} +set_dll_output_name(GraphicsEngineD3D12-shared GraphicsEngineD3D12) set_common_target_properties(GraphicsEngineD3D12-shared) set_common_target_properties(GraphicsEngineD3D12-static) diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index d867df43..551b57fb 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -201,12 +201,10 @@ target_link_libraries(GraphicsEngineOpenGL-shared PRIVATE ${PRIVATE_DEPENDENCIES target_compile_definitions(GraphicsEngineOpenGL-shared PUBLIC ENGINE_DLL=1 PRIVATE BUILDING_DLL=1) if(PLATFORM_WIN32) - set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES - OUTPUT_NAME_DEBUG GraphicsEngineOpenGL${DLL_DBG_SUFFIX} - OUTPUT_NAME_RELEASE GraphicsEngineOpenGL${DLL_REL_SUFFIX} - OUTPUT_NAME_RELWITHDEBINFO GraphicsEngineOpenGL${DLL_REL_SUFFIX} - OUTPUT_NAME_MINSIZEREL GraphicsEngineOpenGL${DLL_REL_SUFFIX} - ) + + # Set output name to GraphicsEngineOpenGL_{32|64}{r|d} + set_dll_output_name(GraphicsEngineOpenGL-shared GraphicsEngineOpenGL) + else() set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES OUTPUT_NAME GraphicsEngineOpenGL |