From a614a0ff21b3d642166dbcfc772efe61285332ac Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 4 Dec 2019 12:32:49 +0300 Subject: CMake: Allow overriding of output paths --- CMakeLists.txt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d08eef..9b36ccc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,9 +9,16 @@ set(CMAKE_C_STANDARD 90) # Prefer C++98 standard set(CMAKE_CXX_STANDARD 98) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +endif() +if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY) + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +endif() +if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +endif() + list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake") if(DJGPP OR MSDOS) -- cgit v1.2.3 From 3fe58d6494528df2f13e5029e764ae28b2d302c8 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Wed, 4 Dec 2019 12:36:31 +0300 Subject: CMake: Don't give "-static" suffix on non-Windows platforms --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b36ccc..f6ac5af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -235,7 +235,7 @@ set(libADLMIDI_SOURCES # === Static library ==== if(libADLMIDI_STATIC OR WITH_VLC_PLUGIN) add_library(ADLMIDI_static STATIC ${libADLMIDI_SOURCES}) - if(libADLMIDI_SHARED) + if(WIN32 AND libADLMIDI_SHARED) set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI-static) else() set_target_properties(ADLMIDI_static PROPERTIES OUTPUT_NAME ADLMIDI) -- cgit v1.2.3