From f3d2772ec01a7f341e1ece22812933b6ef83b020 Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Mon, 11 Jan 2021 20:13:09 -0500 Subject: [PATCH 1/5] CMakeLists.txt: Make libm dep conditional on UNIX --- lua-5.4.0/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lua-5.4.0/CMakeLists.txt b/lua-5.4.0/CMakeLists.txt index d80b4b3..4b54f90 100644 --- a/lua-5.4.0/CMakeLists.txt +++ b/lua-5.4.0/CMakeLists.txt @@ -32,17 +32,20 @@ set(LUA_LIB_SRCS "src/lutf8lib.c" "src/linit.c" ) -#TODO: Redo this with find_package -find_library(LIBM m) -if(NOT LIBM) - message(FATAL_ERROR "libm not found and requred by lua") -endif() + add_library(lua_static STATIC ${LUA_LIB_SRCS}) set_target_properties(lua_static PROPERTIES OUTPUT_NAME "lua") -target_link_libraries(lua_static INTERFACE ${LIBM}) target_include_directories(lua_static PUBLIC "include") set(LUA_DEFINITIONS) if(UNIX) + + 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") From f7b7e0742386dacca9902dc0270741e93836b3dd Mon Sep 17 00:00:00 2001 From: Jacob Moen Date: Tue, 12 Jan 2021 15:06:42 +0100 Subject: [PATCH 2/5] Compiles succesfully on Windows with these changes --- lua-5.4.0/CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lua-5.4.0/CMakeLists.txt b/lua-5.4.0/CMakeLists.txt index 4b54f90..6524dc2 100644 --- a/lua-5.4.0/CMakeLists.txt +++ b/lua-5.4.0/CMakeLists.txt @@ -36,8 +36,8 @@ set(LUA_LIB_SRCS add_library(lua_static STATIC ${LUA_LIB_SRCS}) set_target_properties(lua_static PROPERTIES OUTPUT_NAME "lua") target_include_directories(lua_static PUBLIC "include") -set(LUA_DEFINITIONS) if(UNIX) + set(LUA_DEFINITIONS) find_library(LIBM m) #TODO: Redo this with find_package @@ -51,13 +51,13 @@ if(UNIX) target_compile_definitions(lua_static PRIVATE "LUA_USE_DLOPEN") target_link_libraries(lua_static INTERFACE dl) endif() + target_compile_definitions(lua_static + PUBLIC ${LUA_DEFINITIONS} + ) + target_compile_options(lua_static + PRIVATE "-Wall" "-Wextra" + ) endif() -target_compile_definitions(lua_static - PUBLIC ${LUA_DEFINITIONS} -) -target_compile_options(lua_static - PRIVATE "-Wall" "-Wextra" -) if(LUA_BUILD_BINARY) include(CheckIncludeFile) From d25eef975e2b08b0fb18f9dd5dc9951275074852 Mon Sep 17 00:00:00 2001 From: Walter Schell <3580170+walterschell@users.noreply.github.com> Date: Fri, 15 Jan 2021 11:20:04 -0500 Subject: [PATCH 3/5] Create cmake.yml Try matrix build Better nameing Added fail-fast: false Add emscripten build Split workflow into seperate workflows for seperate badges Forgot to save changes on last commit Added badges to markdown Styling badges on new lines --- .github/workflows/build-emscripten.yml | 44 ++++++++++++++++++++++++ .github/workflows/build-linux.yml | 46 ++++++++++++++++++++++++++ .github/workflows/build-osx.yml | 46 ++++++++++++++++++++++++++ .github/workflows/build-windows.yml | 46 ++++++++++++++++++++++++++ README.md | 6 +++- 5 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build-emscripten.yml create mode 100644 .github/workflows/build-linux.yml create mode 100644 .github/workflows/build-osx.yml create mode 100644 .github/workflows/build-windows.yml diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml new file mode 100644 index 0000000..be4eb6d --- /dev/null +++ b/.github/workflows/build-emscripten.yml @@ -0,0 +1,44 @@ +name: Build Emscripten + +on: [push] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build-emsdk: + 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 + + - name: Configure CMake + # Use a bash shell so we can use the same syntax for environment variable + # access regardless of the host operating system + shell: bash + working-directory: ${{github.workspace}}/build + # Note the current convention is to use the -S and -B options here to specify source + # and build directories, but this is only available with CMake 3.13 and higher. + # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 + run: emcmake cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + + - name: Build + working-directory: ${{github.workspace}}/build + shell: bash + # Execute the build. You can specify a specific target with "--target " + run: emcmake cmake --build . --config $BUILD_TYPE + diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml new file mode 100644 index 0000000..ded15d7 --- /dev/null +++ b/.github/workflows/build-linux.yml @@ -0,0 +1,46 @@ +name: Build Linux + +on: [push] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally + # well on Windows or Mac. You can convert this to a matrix build if you need + # cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + strategy: + fail-fast: false + matrix: + os: [ubuntu-latest] + runs-on: ${{ matrix.os }} + name: build-${{ matrix.os }} + + steps: + - 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 + + - name: Configure CMake + # Use a bash shell so we can use the same syntax for environment variable + # access regardless of the host operating system + shell: bash + working-directory: ${{github.workspace}}/build + # Note the current convention is to use the -S and -B options here to specify source + # and build directories, but this is only available with CMake 3.13 and higher. + # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + + - name: Build + working-directory: ${{github.workspace}}/build + shell: bash + # Execute the build. You can specify a specific target with "--target " + run: cmake --build . --config $BUILD_TYPE + + \ No newline at end of file diff --git a/.github/workflows/build-osx.yml b/.github/workflows/build-osx.yml new file mode 100644 index 0000000..c1cc118 --- /dev/null +++ b/.github/workflows/build-osx.yml @@ -0,0 +1,46 @@ +name: Build OSX + +on: [push] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally + # well on Windows or Mac. You can convert this to a matrix build if you need + # cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + strategy: + fail-fast: false + matrix: + os: [ macos-latest ] + runs-on: ${{ matrix.os }} + name: build-${{ matrix.os }} + + steps: + - 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 + + - name: Configure CMake + # Use a bash shell so we can use the same syntax for environment variable + # access regardless of the host operating system + shell: bash + working-directory: ${{github.workspace}}/build + # Note the current convention is to use the -S and -B options here to specify source + # and build directories, but this is only available with CMake 3.13 and higher. + # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + + - name: Build + working-directory: ${{github.workspace}}/build + shell: bash + # Execute the build. You can specify a specific target with "--target " + run: cmake --build . --config $BUILD_TYPE + + \ No newline at end of file diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml new file mode 100644 index 0000000..86be431 --- /dev/null +++ b/.github/workflows/build-windows.yml @@ -0,0 +1,46 @@ +name: Build Windows + +on: [push] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + +jobs: + build: + # The CMake configure and build commands are platform agnostic and should work equally + # well on Windows or Mac. You can convert this to a matrix build if you need + # cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + strategy: + fail-fast: false + matrix: + os: [windows-latest] + runs-on: ${{ matrix.os }} + name: build-${{ matrix.os }} + + steps: + - 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 + + - name: Configure CMake + # Use a bash shell so we can use the same syntax for environment variable + # access regardless of the host operating system + shell: bash + working-directory: ${{github.workspace}}/build + # Note the current convention is to use the -S and -B options here to specify source + # and build directories, but this is only available with CMake 3.13 and higher. + # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE + + - name: Build + working-directory: ${{github.workspace}}/build + shell: bash + # Execute the build. You can specify a specific target with "--target " + run: cmake --build . --config $BUILD_TYPE + + \ No newline at end of file diff --git a/README.md b/README.md index de4e818..d7f816f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # Lua -CMake based build of Lua 5.4.0 +CMake based build of Lua 5.4.0 +![Build Linux](https://github.com/walterschell/Lua/workflows/Build%20Linux/badge.svg) +![Build Windows](https://github.com/walterschell/Lua/workflows/Build%20Windows/badge.svg) +![Build OSX](https://github.com/walterschell/Lua/workflows/Build%20OSX/badge.svg) +![Build Emscripten](https://github.com/walterschell/Lua/workflows/Build%20Emscripten/badge.svg) # Usage Inside of CMakeLists.txt ```cmake From 7f19c453f6b98f1c333d5d53a5d8deccbb6b8411 Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Sat, 16 Jan 2021 09:46:38 -0500 Subject: [PATCH 4/5] Got rid of caching emscripten env --- .github/workflows/build-emscripten.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml index be4eb6d..d037854 100644 --- a/.github/workflows/build-emscripten.yml +++ b/.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 From 11ca778bb1ecaf6f6681cd9612feb1276bc37762 Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Sat, 16 Jan 2021 09:53:29 -0500 Subject: [PATCH 5/5] Remove libm from emcripten builds --- .github/workflows/build-emscripten.yml | 2 +- lua-5.4.0/CMakeLists.txt | 23 +++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml index d037854..a7cc41d 100644 --- a/.github/workflows/build-emscripten.yml +++ b/.github/workflows/build-emscripten.yml @@ -33,5 +33,5 @@ jobs: working-directory: ${{github.workspace}}/build shell: bash # Execute the build. You can specify a specific target with "--target " - run: emcmake cmake --build . --config $BUILD_TYPE + run: cmake --build . --config $BUILD_TYPE diff --git a/lua-5.4.0/CMakeLists.txt b/lua-5.4.0/CMakeLists.txt index 6524dc2..f0ec5d1 100644 --- a/lua-5.4.0/CMakeLists.txt +++ b/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} )