From 2510f6a6e9b8a754907bb0342fd2feb075092dd0 Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Fri, 14 Dec 2018 15:24:42 +0300 Subject: CMake: Move all directory targets into root script --- utils/adlmidi-2/CMakeLists.txt | 3 --- utils/dumpbank/CMakeLists.txt | 2 -- utils/dumpmiles/CMakeLists.txt | 2 -- utils/midiplay/CMakeLists.txt | 2 -- utils/vlc_codec/CMakeLists.txt | 2 -- utils/xmi2mid/CMakeLists.txt | 2 -- 6 files changed, 13 deletions(-) (limited to 'utils') 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 cdba0e4..a0741ea 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}) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../../cmake") find_package(LIBVLC REQUIRED) message("Found ${LIBVLCCORE_LIBRARY} of version ${LIBVLC_VERSION} with includes ${LIBVLC_INCLUDE_DIR}") 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 -- cgit v1.2.3