From 9b27937a8da1a3d5a334a2016cb964e54887dd71 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 09:41:11 +0100 Subject: Revert "Put back "find_library" of SDL2" This reverts commit c43c8b1293f1766abfef5689c8d21fb0fd124f6f. --- utils/adlmidi-2/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'utils/adlmidi-2/CMakeLists.txt') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 87fa810..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) -- cgit v1.2.3 From 68d5c8d63c4901b1894af89f417285b32727935f Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:13:36 +0100 Subject: Fix SDL2 handling --- utils/adlmidi-2/CMakeLists.txt | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'utils/adlmidi-2/CMakeLists.txt') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 6a31a33..ea4dd3e 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -8,13 +8,8 @@ find_package(OpenMP) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) - find_package(SDL2 REQUIRED) - include_directories(${SDL2_INCLUDE_DIR}) -endif() - -if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) - set(ADLMIDI2_HAS_PUZZLE_GAME "TRUE") - set(ADLMIDI2_VIDEO_OUT_SUPPORT "TRUE") + set(ADLMIDI2_HAS_PUZZLE_GAME TRUE) + set(ADLMIDI2_VIDEO_OUT_SUPPORT TRUE) endif() @@ -29,6 +24,14 @@ if(ADLMIDI2_HAS_PUZZLE_GAME) endif() add_executable(adlmidi2 ${adlmidi2_src}) +target_link_libraries(adlmidi2 PRIVATE ADLMIDI_IF) + +if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) + find_package(SDL2 REQUIRED) + string(STRIP ${SDL2_LIBRARIES} SDL2_LIBRARIES) + target_include_directories(adlmidi2 PRIVATE ${SDL2_INCLUDE_DIRS}) + target_link_libraries(adlmidi2 PRIVATE ${SDL2_LIBRARIES}) +endif() if(ADLMIDI2_HAS_PUZZLE_GAME) target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_PUZZLE_GAME") @@ -44,15 +47,12 @@ if(MSDOS OR DJGPP) endif() if(WIN32) - target_link_libraries(adlmidi2 ADLMIDI_IF winmm) -elseif(DJGPP OR MSDOS) - target_link_libraries(adlmidi2 ADLMIDI_IF) -else() - set(ADLMIDI2_LIBS ADLMIDI_IF ${SDL2_LIBRARY} pthread dl m stdc++) - if(OPENBSD_LOCALBASE) - list(REMOVE_ITEM ADLMIDI2_LIBS dl) + target_link_libraries(adlmidi2 PRIVATE winmm) +else(NOT DJGPP AND NOT MSDOS) + if(NOT OPENBSD_LOCALBASE) + target_link_libraries(adlmidi2 PRIVATE dl) endif() - target_link_libraries(adlmidi2 ${ADLMIDI2_LIBS}) + target_link_libraries(adlmidi2 PRIVATE pthread m stdc++) endif() if(NOT WITH_CPP_EXTRAS) @@ -66,7 +66,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR CMAKE_COMPILER_IS_MINGW) if(OPENMP_FOUND) target_compile_options(adlmidi2 PUBLIC "-fopenmp") - target_link_libraries(adlmidi2 "-fopenmp") + target_link_libraries(adlmidi2 PRIVATE "-fopenmp") endif() else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") message("Turned on C++11 on MSVC") @@ -87,4 +87,3 @@ endif() install(TARGETS adlmidi2 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}") - -- cgit v1.2.3 From 613b7127cfc84ecb0dbfcbee12f0c9776ab20cb5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:18:42 +0100 Subject: Fix compile definitions No "-D" needed --- utils/adlmidi-2/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'utils/adlmidi-2/CMakeLists.txt') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index ea4dd3e..e8dbf13 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -34,15 +34,15 @@ if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) endif() if(ADLMIDI2_HAS_PUZZLE_GAME) - target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_PUZZLE_GAME") + target_compile_definitions(adlmidi2 PUBLIC SUPPORT_PUZZLE_GAME) endif() if(ADLMIDI2_VIDEO_OUT_SUPPORT) - target_compile_definitions(adlmidi2 PUBLIC "-DSUPPORT_VIDEO_OUTPUT") + target_compile_definitions(adlmidi2 PUBLIC SUPPORT_VIDEO_OUTPUT) endif() if(MSDOS OR DJGPP) - target_compile_definitions(adlmidi2 PUBLIC "-DHARDWARE_OPL3") + target_compile_definitions(adlmidi2 PUBLIC HARDWARE_OPL3) message("Turn on hardware OPL3 support on ADLMIDI2 tool") endif() -- cgit v1.2.3 From 24d7bc8fa17765695752eddfb51865d983dc5cf8 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:31:29 +0100 Subject: Optimize targets and related checks --- utils/adlmidi-2/CMakeLists.txt | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'utils/adlmidi-2/CMakeLists.txt') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index e8dbf13..087c06a 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -24,7 +24,7 @@ if(ADLMIDI2_HAS_PUZZLE_GAME) endif() add_executable(adlmidi2 ${adlmidi2_src}) -target_link_libraries(adlmidi2 PRIVATE ADLMIDI_IF) +target_link_libraries(adlmidi2 PRIVATE ADLMIDI) if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS) find_package(SDL2 REQUIRED) @@ -73,16 +73,8 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") target_compile_options(adlmidi2 PUBLIC "/std:c++latest") endif() -if(libADLMIDI_SHARED) - add_dependencies(adlmidi2 ADLMIDI_shared) - if(NOT MSVC) - set_target_properties(adlmidi2 PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'") - endif() -else() - if(NOT libADLMIDI_STATIC) - message(FATAL_ERROR "libADLMIDI is required to be built!") - endif() - add_dependencies(adlmidi2 ADLMIDI_static) +if(TARGET ADLMIDI_shared AND NOT MSVC) + set_target_properties(adlmidi2 PROPERTIES COMPILE_FLAGS "-Wl,-rpath='$$ORIGIN/../lib'") endif() install(TARGETS adlmidi2 -- cgit v1.2.3 From 2fd13442097f92350ee481361f73015c918d91b5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:35:38 +0100 Subject: Improve compiler checks --- utils/adlmidi-2/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'utils/adlmidi-2/CMakeLists.txt') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index 087c06a..e9c1f7d 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -59,11 +59,7 @@ if(NOT WITH_CPP_EXTRAS) message(FATAL_ERROR "ADLMIDI2 Requires C++ Extras. Please enable WITH_CPP_EXTRAS option!") endif() -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" OR - "${CMAKE_CXX_COMPILER_ID}" STREQUAL "MinGW" OR - CMAKE_COMPILER_IS_MINGW) +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel|MinGW" OR MINGW) if(OPENMP_FOUND) target_compile_options(adlmidi2 PUBLIC "-fopenmp") target_link_libraries(adlmidi2 PRIVATE "-fopenmp") -- cgit v1.2.3 From 10603bc5db691f0763891bb255cc23a95818cec5 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Thu, 13 Dec 2018 10:38:27 +0100 Subject: Fix OpenMP handling --- utils/adlmidi-2/CMakeLists.txt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'utils/adlmidi-2/CMakeLists.txt') diff --git a/utils/adlmidi-2/CMakeLists.txt b/utils/adlmidi-2/CMakeLists.txt index e9c1f7d..6907b15 100644 --- a/utils/adlmidi-2/CMakeLists.txt +++ b/utils/adlmidi-2/CMakeLists.txt @@ -4,6 +4,10 @@ project(adlmidi2 CXX) set(CMAKE_CXX_STANDARD 11) find_package(OpenMP) +if(OPENMP_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") +endif() set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) @@ -59,12 +63,7 @@ if(NOT WITH_CPP_EXTRAS) message(FATAL_ERROR "ADLMIDI2 Requires C++ Extras. Please enable WITH_CPP_EXTRAS option!") endif() -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|Intel|MinGW" OR MINGW) - if(OPENMP_FOUND) - target_compile_options(adlmidi2 PUBLIC "-fopenmp") - target_link_libraries(adlmidi2 PRIVATE "-fopenmp") - endif() -else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") +if(MSVC) message("Turned on C++11 on MSVC") target_compile_options(adlmidi2 PUBLIC "/std:c++latest") endif() -- cgit v1.2.3