From 46a5736f096e24326bec47215bd8203d94b4f789 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sat, 16 Jun 2018 19:40:26 +0300
Subject: Upgrated measurer algorithm and re-generated full embedded banks
 database

---
 CMakeLists.txt | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92ecb7c..d171572 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,6 +103,14 @@ if(WITH_OLD_UTILS)
     list(APPEND libADLMIDI_INSTALLS adldumpmiles)
 endif()
 
+if(WITH_ADLMIDI2 OR (WITH_EMBEDDED_BANKS AND WITH_GENADLDATA))
+    find_package(OpenMP)
+endif()
+
+if(WITH_HQ_RESAMPLER)
+    find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
+endif()
+
 if(WITH_EMBEDDED_BANKS)
     if(WITH_GENADLDATA)
         set(GEN_ADLDATA_SRC)
@@ -151,6 +159,10 @@ if(WITH_EMBEDDED_BANKS)
                 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()
             endif()
         else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
             message("Turned on C++11 on MSVC")
@@ -161,12 +173,16 @@ if(WITH_EMBEDDED_BANKS)
             target_compile_options(gen_adldata PUBLIC "-DADLDATA_WITH_COMMENTS")
         endif()
 
-        add_custom_target(
-            gen-adldata-run
-            COMMAND gen_adldata ${libADLMIDI_SOURCE_DIR}/src/adldata.cpp
+        set(ADLDATA_DATABASE
+            "${libADLMIDI_SOURCE_DIR}/src/adldata.cpp"
+        )
+        add_custom_target(gen-adldata-run #OUTPUT ${ADLDATA_DATABASE}
+            COMMAND gen_adldata "${ADLDATA_DATABASE}"
             WORKING_DIRECTORY ${libADLMIDI_SOURCE_DIR}
+            DEPENDS gen_adldata "${libADLMIDI_SOURCE_DIR}/banks.ini"
+            COMMENT "Running Embedded FM banks database generation"
+            VERBATIM
         )
-        add_dependencies(gen-adldata-run gen_adldata)
     endif()
 endif()
 
@@ -333,8 +349,6 @@ if(WITH_MIDIPLAY)
 endif()
 
 if(WITH_ADLMIDI2)
-    find_package(OpenMP)
-
     if(NOT WIN32 AND NOT DJGPP AND NOT MSDOS)
         find_library(SDL2_LIBRARY SDL2 REQUIRED)
         include_directories(${SDL2_INCLUDE_DIR})
@@ -483,12 +497,12 @@ if(WITH_VLC_PLUGIN)
 endif()
 
 if(WITH_HQ_RESAMPLER)
-    find_library(ZITA_RESAMPLER_LIBRARY "zita-resampler" REQUIRED)
-    add_definitions(-DADLMIDI_ENABLE_HQ_RESAMPLER)
     if(libADLMIDI_SHARED)
+        target_compile_definitions(ADLMIDI_shared PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER)
         target_link_libraries(ADLMIDI_shared PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
     endif()
     if(libADLMIDI_STATIC)
+        target_compile_definitions(ADLMIDI_static PRIVATE -DADLMIDI_ENABLE_HQ_RESAMPLER)
         target_link_libraries(ADLMIDI_static PUBLIC "${ZITA_RESAMPLER_LIBRARY}")
     endif()
 endif()
-- 
cgit v1.2.3


From ac2881c53926e0fab4d771d46e7d47694026799a Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 17 Jun 2018 20:43:06 +0300
Subject: Small correction of CMake build

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d171572..2901ba5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.2)
-project (libADLMIDI)
+project (libADLMIDI C CXX)
 
 #===========================================================================================
 # Strip garbage
@@ -20,7 +20,8 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
-if (CMAKE_BUILD_TYPE EQUAL "RELEASE")
+string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+if(CMAKE_BUILD_TYPE_LOWER EQUAL "release")
     add_definitions(-DNDEBUG)
 ENDIF()
 
-- 
cgit v1.2.3


From 2f5d59e3052e280a8dbcc2f04685753553d10281 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Sun, 17 Jun 2018 21:01:21 +0300
Subject: Set Release when CMAKE_BUILD_TYPE is not defined

---
 CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2901ba5..899839f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,10 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
+if(CMAKE_BUILD_TYPE STREQUAL "")
+    set(CMAKE_BUILD_TYPE "Release")
+endif()
+
 string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
 if(CMAKE_BUILD_TYPE_LOWER EQUAL "release")
     add_definitions(-DNDEBUG)
-- 
cgit v1.2.3


From c7f8dbee64d404e66e5d89946027794eac5c5421 Mon Sep 17 00:00:00 2001
From: Vitaly Novichkov <admin@wohlnet.ru>
Date: Mon, 18 Jun 2018 01:45:58 +0300
Subject: CMake: Fixed configure when no CMAKE_BUILD_TYPE was defined

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 899839f..c26d5ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ IF(NOT MSVC AND NOT MSDOS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
 ENDIF()
 
-if(CMAKE_BUILD_TYPE STREQUAL "")
+if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-- 
cgit v1.2.3