diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-13 10:53:20 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-12-13 10:53:20 +0300 |
| commit | f80bfa9732312e74e2494ed81231d61c78f83350 (patch) | |
| tree | e22430d36208d3460e6aff052701128ffed0736a /utils | |
| parent | d6f6848765f25a894103cccdbbd7e5f09d582236 (diff) | |
| download | libADLMIDI-f80bfa9732312e74e2494ed81231d61c78f83350.tar.gz libADLMIDI-f80bfa9732312e74e2494ed81231d61c78f83350.tar.bz2 libADLMIDI-f80bfa9732312e74e2494ed81231d61c78f83350.zip | |
Continue clean-up of CMake build
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/adlmidi-2/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | utils/gen_adldata/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | utils/midiplay/CMakeLists.txt | 3 |
3 files changed, 5 insertions, 19 deletions
diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 3f3327b..6a31a33 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -8,9 +8,8 @@ find_package(OpenMP) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) - find_library(SDL2_LIBRARY SDL2 REQUIRED) + find_package(SDL2 REQUIRED) include_directories(${SDL2_INCLUDE_DIR}) - message("Found ${SDL2_LIBRARY}") endif() if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) @@ -65,12 +64,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR CMAKE_COMPILER_IS_MINGW) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2) - message("Turned on C++11 on GCC/CLang/Intel") - set_target_properties(adlmidi2 PROPERTIES - CXX_STANDARD 11 - CXX_STANDARD_REQUIRED YES) - endif() if(OPENMP_FOUND) target_compile_options(adlmidi2 PUBLIC "-fopenmp") target_link_libraries(adlmidi2 "-fopenmp") diff --git a/utils/gen_adldata/CMakeLists.txt b/utils/gen_adldata/CMakeLists.txt index 63f255f..766b9b7 100644 --- a/utils/gen_adldata/CMakeLists.txt +++ b/utils/gen_adldata/CMakeLists.txt @@ -48,15 +48,9 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR CMAKE_COMPILER_IS_MINGW) - if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER 3.2) - message("Turned on C++11 on GCC/CLang/Intel/MinGW") - set_target_properties(gen_adldata PROPERTIES - CXX_STANDARD 11 - CXX_STANDARD_REQUIRED YES) - if(OPENMP_FOUND) - target_compile_options(gen_adldata PUBLIC "-fopenmp") - target_link_libraries(gen_adldata "-fopenmp") - endif() + if(OPENMP_FOUND) + target_compile_options(gen_adldata PUBLIC "-fopenmp") + target_link_libraries(gen_adldata "-fopenmp") endif() else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message("Turned on C++11 on MSVC") diff --git a/utils/midiplay/CMakeLists.txt b/utils/midiplay/CMakeLists.txt index ac5d4c2..8aef37f 100644 --- a/utils/midiplay/CMakeLists.txt +++ b/utils/midiplay/CMakeLists.txt @@ -4,9 +4,8 @@ project(adlmidiplay CXX) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if(NOT MSDOS AND NOT DJGPP AND NOT MIDIPLAY_WAVE_ONLY) - find_library(SDL2_LIBRARY SDL2 REQUIRED) + find_package(SDL2 REQUIRED) include_directories(${SDL2_INCLUDE_DIR}) - message("Found ${SDL2_LIBRARY}") else() unset(SDL2_LIBRARY) endif() |