Fix cmake and makefile

cpetig · Aug 23, 2022 · 688984d · 688984d
1 parent 0059a95
commit 688984d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -23,8 +23,8 @@ jobs:
         git checkout f474248365ad48654ba8a27ac5bf49a6afbb80e7
         git apply ../tflite_micro_compiler/patches/tflite-micro.patch
         git apply ../tflite_micro_compiler/patches/tflite-micro-makefile.patch
-        make -Bf tensorflow/lite/micro/tools/make/Makefile NO_INTERPRETER=TRUE microlite
-        make -Bf tensorflow/lite/micro/tools/make/Makefile microlite
+        make -Bf tensorflow/lite/micro/tools/make/Makefile NO_INTERPRETER=TRUE microlite -j2
+        make -Bf tensorflow/lite/micro/tools/make/Makefile microlite -j2
     - name: Requirements (Windows)
       if: matrix.config.os == 'windows-latest'
       run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,9 +21,9 @@ IF(NOT GET_TF_SRC)
             ${TFLMD_SRC}/ruy
         )
         IF(WIN32)
-            SET(TF_LIB ${TFLM_SRC}/tools/make/gen/windows_x86_64/lib/libtensorflow-microlite.a)
+            SET(TF_LIB ${TFLM_SRC}/tools/make/gen/windows_x86_64_default/lib/libtensorflow-microlite.a)
         ELSE()
-            SET(TF_LIB ${TFLM_SRC}/tools/make/gen/linux_x86_64/lib/libtensorflow-microlite.a)
+            SET(TF_LIB ${TFLM_SRC}/tools/make/gen/linux_x86_64_default/lib/libtensorflow-microlite.a)
         ENDIF()
     ELSE()
         MESSAGE(FATAL_ERROR "\

diff --git a/examples/generic_test/CMakeLists.txt b/examples/generic_test/CMakeLists.txt
@@ -19,9 +19,9 @@ TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC
 )
 
 IF(WIN32)
-    TARGET_LINK_DIRECTORIES(${PROJECT_NAME} PUBLIC ${TFLM_SRC}/tools/make/gen/windows_x86_64/lib)
+    TARGET_LINK_DIRECTORIES(${PROJECT_NAME} PUBLIC ${TFLM_SRC}/tools/make/gen/windows_x86_64_default/lib)
 ELSE()
-    TARGET_LINK_DIRECTORIES(${PROJECT_NAME} PUBLIC ${TFLM_SRC}/tools/make/gen/linux_x86_64/lib)
+    TARGET_LINK_DIRECTORIES(${PROJECT_NAME} PUBLIC ${TFLM_SRC}/tools/make/gen/linux_x86_64_default/lib)
 ENDIF()
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC tensorflow-microlite-no-interpreter)