Update Debug builds of Test and SDKTool to work with binary download of ORTools

Author: sjanzou

sdktool/CMakeLists.txt

@@ -23,9 +23,9 @@ set(SDKTOOL_SRC
 if (UNIX)
 	set(wxWidgets_CONFIG_EXECUTABLE /usr/local/bin/wx-config-3)
 	find_package(wxWidgets QUIET  COMPONENTS qa aui richtext html propgrid adv net stc core xml base REQUIRED)
-#else()
-#	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
-#	find_package(wxWidgets  QUIET COMPONENTS qa webview aui richtext html propgrid adv net stc core xml base scintilla REQUIRED)
+else()
+	set(wxWidgets_ROOT_DIR $ENV{WXMSW3})
+	find_package(wxWidgets  QUIET COMPONENTS qa webview aui richtext html propgrid adv net stc core xml base scintilla REQUIRED)
 endif()
 
 include(${wxWidgets_USE_FILE})

test/CMakeLists.txt

@@ -77,9 +77,10 @@ endif()
 
 if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR "Debug" IN_LIST CMAKE_CONFIGURATION_TYPES)
     find_library( GTESTD_LIB
-            NAMES libgtest.a gtest.lib libgtest.so
-# ortools release libraries for MSVC           PATHS $ENV{GTEST_DIR} ${GTDIR}/build/lib ${GTDIR}/build/lib/Debug)
-            PATHS $ENV{GTEST_DIR} ${GTDIR}/build/lib ${GTDIR}/build/lib/Release)
+        NAMES libgtest.a gtest.lib libgtest.so
+# ortools release libraries for MSVC           
+        PATHS $ENV{GTEST_DIR} ${GTDIR}/build/lib ${GTDIR}/build/lib/Debug)
+#            PATHS $ENV{GTEST_DIR} ${GTDIR}/build/lib ${GTDIR}/build/lib/Release)
     if(UNIX AND ENABLE_COVERAGE)
         target_link_options(Test PRIVATE --coverage)
         target_link_libraries(Test debug gcov ${GTESTD_LIB})