Merge pull request #6 from ssbc/combined_cmake

Improve Codec2 CMake script to be compatible with Windows
ssbc · Aug 22, 2023 · b958671 · b958671
2 parents 8778878 + 97a00c0
commit b958671
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 368 deletions.
diff --git a/android/tinySSB/README.md b/android/tinySSB/README.md
@@ -21,10 +21,7 @@ app is active (no background syncing).
 
 Compiling the ```tinySSB``` app is challenging because of the included
 Codec2 library which must be cross-compiled to native code (for
-Android smartphones). If on Windows you may have to change the file
-```tinySSB/app/src/main/codec2/src/CMakeLists.txt``` and add a
-```.exe``` suffix to a file name, see
-```tinySSB/app/src/main/codec2/src/CMakeLists-for-windows.txt```.
+Android smartphones).
 
 The compilation is currently configured to generate an APK that
 runs on devices in the range of Android 8/Oreo to Android 12 (SDK 26 to 31).

diff --git a/android/tinySSB/app/src/main/codec2/src/CMakeLists-for-windows.txt b/android/tinySSB/app/src/main/codec2/src/CMakeLists-for-windows.txt
diff --git a/android/tinySSB/app/src/main/codec2/src/CMakeLists.txt b/android/tinySSB/app/src/main/codec2/src/CMakeLists.txt
@@ -64,12 +64,15 @@ set(CODEBOOKSNEWAMP2_ENERGY
 # when crosscompiling we need a native executable
 if(CMAKE_CROSSCOMPILING)
     set(CMAKE_DISABLE_SOURCE_CHANGES OFF)
+    if(CMAKE_HOST_WIN32)
+        set(GENERATE_CODEBOOK_EXTENSION ".exe")
+    endif(CMAKE_HOST_WIN32)
     include(ExternalProject)
     ExternalProject_Add(codec2_native
        SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..
        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/codec2_native
        BUILD_COMMAND ${CMAKE_COMMAND} --build . --target generate_codebook
-       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/codec2_native/src/generate_codebook ${CMAKE_CURRENT_BINARY_DIR}
+       INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/codec2_native/src/generate_codebook${GENERATE_CODEBOOK_EXTENSION} ${CMAKE_CURRENT_BINARY_DIR}
        BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/generate_codebook
     )
     add_executable(generate_codebook IMPORTED)