Commit 5e50791a authored by hbristow's avatar hbristow

Generator and compiler now working on Windows. Moved matlab to correct VS solution folder

parent 58ca8ed9
...@@ -60,10 +60,6 @@ prepend("-L" MEX_LIB_DIR ${CMAKE_BINARY_DIR}/lib) ...@@ -60,10 +60,6 @@ prepend("-L" MEX_LIB_DIR ${CMAKE_BINARY_DIR}/lib)
prepend("-l" MEX_LIBS opencv_core) prepend("-l" MEX_LIBS opencv_core)
set(MEX_OPTS -largeArrayDims) set(MEX_OPTS -largeArrayDims)
if (ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_module} PROPERTIES FOLDER "Matlab bindings")
endif()
if (BUILD_TESTS) if (BUILD_TESTS)
add_subdirectory(test) add_subdirectory(test)
endif() endif()
...@@ -182,6 +178,10 @@ add_custom_target(${the_module}_sources ALL DEPENDS ${GENERATE_PROXY}) ...@@ -182,6 +178,10 @@ add_custom_target(${the_module}_sources ALL DEPENDS ${GENERATE_PROXY})
add_custom_target(${the_module} ALL DEPENDS ${COMPILE_PROXY}) add_custom_target(${the_module} ALL DEPENDS ${COMPILE_PROXY})
add_dependencies(${the_module} ${the_module}_sources ${${the_module}_ACTUAL_DEPS}) add_dependencies(${the_module} ${the_module}_sources ${${the_module}_ACTUAL_DEPS})
if (ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_module} PROPERTIES FOLDER "modules")
endif()
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Install time components # Install time components
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment