Merge pull request #6 from walterschell/WIP/fix-emscripten

Fixes emscripten

.github/workflows/build-emscripten.yml

@@ -11,20 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: mymindstorm/setup-emsdk@v7
-        with:
-          # Make sure to set a version number!
-          version: 1.38.40
-          # This is the name of the cache folder.
-          # The cache folder will be placed in the build directory,
-          #  so make sure it doesn't conflict with anything!
-          actions-cache-folder: 'emsdk-cache'
-
+      
       - uses: actions/checkout@v2
-
+      
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands
-        run: cmake -E make_directory ${{github.workspace}}/build
+        run: emcmake cmake -E make_directory ${{github.workspace}}/build
 
       - name: Configure CMake
         # Use a bash shell so we can use the same syntax for environment variable
@@ -40,5 +33,5 @@ jobs:
         working-directory: ${{github.workspace}}/build
         shell: bash
         # Execute the build.  You can specify a specific target with "--target <NAME>"
-        run: emcmake cmake --build . --config $BUILD_TYPE
+        run: cmake --build . --config $BUILD_TYPE
 

lua-5.4.0/CMakeLists.txt

@@ -39,18 +39,21 @@ target_include_directories(lua_static PUBLIC "include")
 if(UNIX)
 	set(LUA_DEFINITIONS)
     
-    find_library(LIBM m)
-    #TODO: Redo this with find_package
-    if(NOT LIBM)
-        message(FATAL_ERROR "libm not found and requred by lua")
-    endif()
-    target_link_libraries(lua_static INTERFACE ${LIBM})
+    if(NOT EMSCRIPTEN)
+        find_library(LIBM m)
+        #TODO: Redo this with find_package
+        if(NOT LIBM)
+            message(FATAL_ERROR "libm not found and requred by lua")
+        endif()
+        target_link_libraries(lua_static INTERFACE ${LIBM})
 
-    list(APPEND LUA_DEFINITIONS LUA_USE_POSIX)
-    if(LUA_SUPPORT_DL)
-        target_compile_definitions(lua_static PRIVATE "LUA_USE_DLOPEN")
-        target_link_libraries(lua_static INTERFACE dl)
+        list(APPEND LUA_DEFINITIONS LUA_USE_POSIX)
+        if(LUA_SUPPORT_DL)
+            target_compile_definitions(lua_static PRIVATE "LUA_USE_DLOPEN")
+            target_link_libraries(lua_static INTERFACE dl)
+        endif()
     endif()
+
 	target_compile_definitions(lua_static 
 		PUBLIC ${LUA_DEFINITIONS}
 	)