Эх сурвалжийг харах

Removed mex files from include list and added library dependecy

Clemens-Alexander Brust 11 жил өмнө
parent
commit
88bcae950c

+ 2 - 2
CMakeLists.txt

@@ -5,7 +5,7 @@
 set(the_library "gp-hik-core")
 
 #add linkage dependencies to other libraries here
-set("nice_${the_library}_LINKING_DEPENDENCIES" "nice_core")
+set("nice_${the_library}_LINKING_DEPENDENCIES" "nice_core" ${MEX_LIBRARIES})
 
 #####################################################
 message(STATUS "adding library ${the_library}")
@@ -61,4 +61,4 @@ nice_add_unittests()
 #         install(FILES ${hdr} DESTINATION "${OPENCV_INCLUDE_INSTALL_PATH}/${CMAKE_MATCH_1}" COMPONENT main)
 #       endif()
 #     endforeach()
-#   endif()
+#   endif()

+ 0 - 11
list_exclude_from_build.cmake

@@ -1,11 +0,0 @@
-SET(list_exclude_from_build_SRC
-matlab/ConverterMatlabToNICE.cpp
-matlab/ConverterMatlabToNICE.h
-matlab/ConverterNICEToMatlab.cpp
-matlab/ConverterNICEToMatlab.h
-matlab/GPHIKClassifierMex.cpp
-matlab/GPHIKRegressionMex.cpp	
-matlab/testMex.cpp	
-matlab/testMatlabConversionFunctionsMex.cpp
-)
-