Fix MSVC min/max macro confusing with STL numeric_limits::max (issue #210) in...

Fix MSVC min/max macro confusing with STL numeric_limits::max (issue #210) in faust_linear_operator target.

Fixing also a warning in python wrapper CMakeLists.txt.

src/faust_linear_operator/CMakeLists.txt

@@ -25,21 +25,14 @@ endif()
 if (BUILD_VERBOSE)
 	set(FAUST_VERBOSE "1")
 endif()
-	
-# permet de definir ou non la variable de compilation FAUST_SINGLE
-configure_file(${FAUST_SRC_LINEAR_OPERATOR_DIR}/faust_constant.h.in ${FAUST_SRC_LINEAR_OPERATOR_DIR}/faust_constant.h @ONLY)
 
-#message(STATUS "AAAAAAAAAAAAAAAAAAAAAAAAAAAA")
-#add_library(${FAUST_FAUSTCORE_TARGET} OBJECT ${HPP_FILES})
-#add_library(${FAUST_MATRIX_TARGET} OBJECT ${CPP_FILES})
+configure_file(${FAUST_SRC_LINEAR_OPERATOR_DIR}/faust_constant.h.in ${FAUST_SRC_LINEAR_OPERATOR_DIR}/faust_constant.h @ONLY)
 
 add_library(${FAUST_LINEAR_OPERATOR_TARGET} OBJECT ${CPP_FILES} ${HPP_FILES})
 
+target_compile_definitions(${FAUST_LINEAR_OPERATOR_TARGET} PRIVATE NOMINMAX)
 
 
-#set_target_properties(${FAUST_LINEAR_OPERATOR_TARGET} PROPERTIES LINKER_LANGUAGE CXX)
-#set_target_properties(${FAUST_FAUSTCORE_TARGET} PROPERTIES LINKER_LANGUAGE CXX) #comme il n y a que des hpp, force la compilation en  langage C++ pour eviter des erreurs et des warnings
-
 
 
 

src/faust_linear_operator/CPU/faust_TransformHelper.cpp

-#include <faust_TransformHelper.h>
+#include "faust_TransformHelper.h"
 
 namespace Faust
 {

src/faust_linear_operator/CPU/faust_TransformHelper.h

@@ -4,7 +4,7 @@
 /*  of the project : <http://faust.inria.fr>                         */
 /*                                                                          */
 /*                              License:                                    */
-/*  Copyright (2019):    Hakim Hadj-Djilani, Nicolas Bellot, Adrien Leman, Thomas Gautrais,      */
+/*  Copyright (2021):    Hakim Hadj-Djilani, Nicolas Bellot, Adrien Leman, Thomas Gautrais,      */
 /*                      Luc Le Magoarou, Remi Gribonval                     */
 /*                      INRIA Rennes, FRANCE                                */
 /*                      http://www.inria.fr/                                */
@@ -42,6 +42,7 @@
 #ifndef __FAUST_TRANSFORM_HELPER___
 #define __FAUST_TRANSFORM_HELPER___
 
+#define NOMINMAX // avoids VS min/max issue with std::min/max.
 #include <memory>
 #include "faust_TransformHelperGen.h"
 #include "faust_RefManager.h"

src/faust_linear_operator/CPU/faust_TransformHelper.hpp

@@ -4,7 +4,7 @@
 /*  of the project : <http://faust.inria.fr>                         */
 /*                                                                          */
 /*                              License:                                    */
-/*  Copyright (2019):    Hakim Hadj-Djilani, Nicolas Bellot, Adrien Leman, Thomas Gautrais,      */
+/*  Copyright (2021):    Hakim Hadj-Djilani, Nicolas Bellot, Adrien Leman, Thomas Gautrais,      */
 /*                      Luc Le Magoarou, Remi Gribonval                     */
 /*                      INRIA Rennes, FRANCE                                */
 /*                      http://www.inria.fr/                                */
@@ -1365,6 +1365,8 @@ template<typename FPP>
 	return t;
 }
 
+
+
 	template<typename FPP> bool TransformHelper<FPP,Cpu>::seed_init = false;
 	template<typename FPP> std::default_random_engine TransformHelper<FPP,Cpu>::generator(time(NULL));
 

wrapper/python/CMakeLists.txt

@@ -29,7 +29,7 @@ if(${USE_MATIO_STATIC_LIBS})
 			file(GLOB LIN_OP_CPP_FILES ${FAUST_LINEAR_OPERATOR_CPU_SRC_DIR}/*.cpp)
 			foreach(CPP_FILE IN LISTS LIN_OP_CPP_FILES)
 				if(NOT ${CPP_FILE} MATCHES .*faust_torch.cpp)
-					message(STATUS "OK to add:"${CPP_FILE})
+					message(STATUS "OK to add:" ${CPP_FILE})
 					set(PY_EXT_SOURCES "${PY_EXT_SOURCES}+['${CPP_FILE}']")
 				endif()
 			endforeach()