diff options
| author | Wohlstand <admin@wohlnet.ru> | 2019-12-04 12:36:49 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2019-12-04 12:36:49 +0300 |
| commit | e7847d9ff4a71c0f5266d611b5c20988f0709f4f (patch) | |
| tree | 1aea144c23e1fce87b258f46c910863be1fd7836 /CMakeLists.txt | |
| parent | 17df689e56bf89179b9176ba71e508fb8c0c141b (diff) | |
| parent | 3fe58d6494528df2f13e5029e764ae28b2d302c8 (diff) | |
| download | libADLMIDI-e7847d9ff4a71c0f5266d611b5c20988f0709f4f.tar.gz libADLMIDI-e7847d9ff4a71c0f5266d611b5c20988f0709f4f.tar.bz2 libADLMIDI-e7847d9ff4a71c0f5266d611b5c20988f0709f4f.zip | |
Merge branch 'master' into wip-new-embedded-banks
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 444c273..1dc7a5e 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) @@ -231,7 +238,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) |