diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-15 18:32:36 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-15 18:32:36 +0300 |
| commit | 977dfbe8eb96df5b5caf8d47e5692bcd8f88a865 (patch) | |
| tree | 296649d80aa4054a0a0a477a30bc805115d78739 | |
| parent | 252ad020ded03d32b68914c09e9b0dac339d4af1 (diff) | |
| parent | 2510f6a6e9b8a754907bb0342fd2feb075092dd0 (diff) | |
| download | libADLMIDI-977dfbe8eb96df5b5caf8d47e5692bcd8f88a865.tar.gz libADLMIDI-977dfbe8eb96df5b5caf8d47e5692bcd8f88a865.tar.bz2 libADLMIDI-977dfbe8eb96df5b5caf8d47e5692bcd8f88a865.zip | |
Merge branch 'master' of github.com:Wohlstand/libADLMIDI
# Conflicts:
# utils/vlc_codec/CMakeLists.txt
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/sdl2_audio/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | utils/dumpbank/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/dumpmiles/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/midiplay/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/vlc_codec/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | utils/xmi2mid/CMakeLists.txt | 2 |
8 files changed, 4 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 20e2858..2acb392 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,10 @@ 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(DJGPP OR MSDOS) set(ADLMIDI_DOS 1) endif() diff --git a/examples/sdl2_audio/CMakeLists.txt b/examples/sdl2_audio/CMakeLists.txt index 32051c8..47924d0 100644 --- a/examples/sdl2_audio/CMakeLists.txt +++ b/examples/sdl2_audio/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - find_package(SDL2 REQUIRED) string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 525ac05..ee081c6 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -6,14 +6,11 @@ if(OPENMP_FOUND) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") endif() -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - if(NOT WIN32 AND NOT ADLMIDI_DOS) set(ADLMIDI2_HAS_PUZZLE_GAME TRUE) set(ADLMIDI2_VIDEO_OUT_SUPPORT TRUE) endif() - set(adlmidi2_src) list(APPEND adlmidi2_src midiplay.cc diff --git a/utils/dumpbank/CMakeLists.txt b/utils/dumpbank/CMakeLists.txt index ed88d8d..1b84efe 100644 --- a/utils/dumpbank/CMakeLists.txt +++ b/utils/dumpbank/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - add_executable(adldumpbank dumpbank.cpp) install(TARGETS adldumpbank diff --git a/utils/dumpmiles/CMakeLists.txt b/utils/dumpmiles/CMakeLists.txt index 1de2922..0faab06 100644 --- a/utils/dumpmiles/CMakeLists.txt +++ b/utils/dumpmiles/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - add_executable(adldumpmiles dumpmiles.cpp) install(TARGETS adldumpmiles diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index e859f98..4f0c411 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - add_executable(adlmidiplay adlmidiplay.cpp wave_writer.c diff --git a/utils/vlc_codec/CMakeLists.txt b/utils/vlc_codec/CMakeLists.txt index 0f71afc..1f37890 100644 --- a/utils/vlc_codec/CMakeLists.txt +++ b/utils/vlc_codec/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - set(CMAKE_C_STANDARD 99) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../cmake") diff --git a/utils/xmi2mid/CMakeLists.txt b/utils/xmi2mid/CMakeLists.txt index 56037df..f4a7c94 100644 --- a/utils/xmi2mid/CMakeLists.txt +++ b/utils/xmi2mid/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) - add_executable(xmi2mid xmi2mid.cpp) install(TARGETS xmi2mid |