Small MSVC compilation fixes

CMakeLists.txt

@@ -127,9 +127,8 @@ include_directories(${PROJECT_SOURCE_DIR}/src/cpp)
 #add_definitions( "-Wall -ansi -pedantic" )
 # HDF5 uses long long which is not ansi
 if (WIN32)
-    # lots of warnings with cl.exe right now
-    #add_definitions( "/W1" )
-	add_definitions("-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /bigobj")
+    # lots of warnings with cl.exe right now, use /W1
+    add_definitions("/W1 -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS /bigobj")
 else(WIN32)
     add_definitions( "-Wall -Wno-unknown-pragmas" )
 endif(WIN32)

src/matlab/CMakeLists.txt

@@ -31,7 +31,7 @@ if(MEX_CMD AND MEXEXT_CMD)
         SET(MEX_FILE ${CMAKE_CURRENT_BINARY_DIR}/${MEX_NAME}.${MEX_EXTENSION})
 
         if (WIN32)
-            set(MEX_BUILD_FLAGS "COMPFLAGS='$$COMPFLAGS ${OpenMP_CXX_FLAGS}' LINKFLAGS='$$LINKFLAGS ${OpenMP_CXX_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}'")
+            set(MEX_BUILD_FLAGS "COMPFLAGS=\"$$COMPFLAGS ${OpenMP_CXX_FLAGS}\" LINKFLAGS=\"$$LINKFLAGS ${OpenMP_CXX_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}\"")
         else()
             set(MEX_BUILD_FLAGS "CFLAGS='$$CFLAGS ${OpenMP_CXX_FLAGS}' LDFLAGS='$$LDFLAGS ${OpenMP_CXX_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}'")
         endif()