Explorar o código

Merge pull request #98 from AMDmi3/freebsd-fixes

FreeBSD fixes
Ivan Savenko %!s(int64=10) %!d(string=hai) anos
pai
achega
b55ab61605

+ 1 - 1
AI/FuzzyLite/fuzzylite/fl/norm/SNorm.h

@@ -40,7 +40,7 @@ namespace fl {
 
         FL_DEFAULT_COPY_AND_MOVE(SNorm)
 
-        virtual SNorm* clone() const = 0;
+        virtual SNorm* clone() const FL_IOVERRIDE = 0;
     };
 }
 #endif  /* FL_SNORM_H */

+ 1 - 1
AI/FuzzyLite/fuzzylite/fl/norm/TNorm.h

@@ -40,7 +40,7 @@ namespace fl {
 
         FL_DEFAULT_COPY_AND_MOVE(TNorm)
 
-        virtual TNorm* clone() const = 0;
+        virtual TNorm* clone() const FL_IOVERRIDE = 0;
     };
 }
 #endif  /* TNORM_H */

+ 2 - 5
CMakeLists.txt

@@ -105,13 +105,10 @@ if(NOT WIN32)
 	if(HAVE_RT_LIB)
 		set(SYSTEM_LIBS ${SYSTEM_LIBS} rt)
 	endif()
-
-	CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_DL_LIB)
-	if(HAVE_DL_LIB)
-		set(SYSTEM_LIBS ${SYSTEM_LIBS} dl)
-	endif()
 endif()
 
+set(SYSTEM_LIBS ${SYSTEM_LIBS} ${CMAKE_DL_LIBS})
+
 set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE)
 find_package(Boost 1.48.0 COMPONENTS filesystem locale program_options system thread REQUIRED)
 find_package(ZLIB REQUIRED)