From a574e7679d12df7e78f5f9f09659c20d2dd2779e Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Mon, 26 Apr 2021 07:38:33 -0400 Subject: [PATCH 1/6] Added GitHub actions to build for CXX when supported --- .github/workflows/build-emscripten-cxx.yml | 37 +++++++++++++++++ .github/workflows/build-emscripten.yml | 2 +- .github/workflows/build-linux-cxx.yml | 46 ++++++++++++++++++++++ .github/workflows/build-linux.yml | 2 +- .github/workflows/build-osx-cxx.yml | 46 ++++++++++++++++++++++ .github/workflows/build-osx.yml | 2 +- .github/workflows/build-windows-cxx.yml | 46 ++++++++++++++++++++++ .github/workflows/build-windows.yml | 2 +- 8 files changed, 179 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/build-emscripten-cxx.yml create mode 100644 .github/workflows/build-linux-cxx.yml create mode 100644 .github/workflows/build-osx-cxx.yml create mode 100644 .github/workflows/build-windows-cxx.yml diff --git a/.github/workflows/build-emscripten-cxx.yml b/.github/workflows/build-emscripten-cxx.yml new file mode 100644 index 0000000..28bc761 --- /dev/null +++ b/.github/workflows/build-emscripten-cxx.yml @@ -0,0 +1,37 @@ +name: Build Emscripten as C++ + +on: [push, pull_request] + +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 + + - 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: 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 + # 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 -DLUA_BUILD_AS_CXX=ON + + - 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 + diff --git a/.github/workflows/build-emscripten.yml b/.github/workflows/build-emscripten.yml index a7cc41d..aeade19 100644 --- a/.github/workflows/build-emscripten.yml +++ b/.github/workflows/build-emscripten.yml @@ -1,6 +1,6 @@ name: Build Emscripten -on: [push] +on: [push, pull_request] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/build-linux-cxx.yml b/.github/workflows/build-linux-cxx.yml new file mode 100644 index 0000000..e25ede6 --- /dev/null +++ b/.github/workflows/build-linux-cxx.yml @@ -0,0 +1,46 @@ +name: Build Linux as C++ + +on: [push, pull_request] + +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 -DLUA_BUILD_AS_CXX=ON + + - 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-linux.yml b/.github/workflows/build-linux.yml index ded15d7..91c6deb 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -1,6 +1,6 @@ name: Build Linux -on: [push] +on: [push, pull_request] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/build-osx-cxx.yml b/.github/workflows/build-osx-cxx.yml new file mode 100644 index 0000000..0d53876 --- /dev/null +++ b/.github/workflows/build-osx-cxx.yml @@ -0,0 +1,46 @@ +name: Build OSX as C++ + +on: [push, pull_request] + +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 -DLUA_BUILD_AS_CXX=ON + + - 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 index c1cc118..a507dcb 100644 --- a/.github/workflows/build-osx.yml +++ b/.github/workflows/build-osx.yml @@ -1,6 +1,6 @@ name: Build OSX -on: [push] +on: [push, pull_request] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/build-windows-cxx.yml b/.github/workflows/build-windows-cxx.yml new file mode 100644 index 0000000..9c2cecf --- /dev/null +++ b/.github/workflows/build-windows-cxx.yml @@ -0,0 +1,46 @@ +name: Build Windows as C++ + +on: [push, pull_request] + +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 -DLUA_BUILD_AS_CXX=ON + + - 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 index 86be431..45681ea 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -1,6 +1,6 @@ name: Build Windows -on: [push] +on: [push, pull_request] env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) From 06f57db5d6ff189e8f04ac52f19498d7001b445f Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Mon, 26 Apr 2021 07:40:55 -0400 Subject: [PATCH 2/6] Added previously omitted lua.hpp header file --- lua-5.4.2/include/lua.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 lua-5.4.2/include/lua.hpp diff --git a/lua-5.4.2/include/lua.hpp b/lua-5.4.2/include/lua.hpp new file mode 100644 index 0000000..ec417f5 --- /dev/null +++ b/lua-5.4.2/include/lua.hpp @@ -0,0 +1,9 @@ +// lua.hpp +// Lua header files for C++ +// <> not supplied automatically because Lua also compiles as C++ + +extern "C" { +#include "lua.h" +#include "lualib.h" +#include "lauxlib.h" +} From be9aad4a56a0f4cf15a3a39da384d0639ffb1fb8 Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Sun, 25 Apr 2021 20:39:29 +0200 Subject: [PATCH 3/6] Added ability to compile lua as C++ --- CMakeLists.txt | 1 + lua-5.4.2/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5032f51..71c5739 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.1) project(lua LANGUAGES C VERSION 5.4.2) option(LUA_SUPPORT_DL "Support dynamic loading of compiled modules" OFF) +option(LUA_BUILD_AS_CXX "Build lua as C++" OFF) if(${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME}) set(TOP_LEVEL TRUE) diff --git a/lua-5.4.2/CMakeLists.txt b/lua-5.4.2/CMakeLists.txt index f155311..9b4cc76 100644 --- a/lua-5.4.2/CMakeLists.txt +++ b/lua-5.4.2/CMakeLists.txt @@ -33,6 +33,10 @@ set(LUA_LIB_SRCS "src/linit.c" ) +if(LUA_BUILD_AS_CXX) + SET_SOURCE_FILES_PROPERTIES(${LUA_LIB_SRCS} PROPERTIES LANGUAGE CXX ) +endif() + add_library(lua_static STATIC ${LUA_LIB_SRCS}) set_target_properties(lua_static PROPERTIES OUTPUT_NAME "lua") target_include_directories(lua_static PUBLIC "include") From 045961e7a08b5d579b34b766da914c4964e67aaa Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Mon, 26 Apr 2021 17:02:07 +0200 Subject: [PATCH 4/6] Apply suggestions from code review Co-authored-by: Walter Schell <3580170+walterschell@users.noreply.github.com> --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 71c5739..db75d71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ project(lua LANGUAGES C VERSION 5.4.2) option(LUA_SUPPORT_DL "Support dynamic loading of compiled modules" OFF) option(LUA_BUILD_AS_CXX "Build lua as C++" OFF) +enable_language(CXX) if(${PROJECT_NAME} STREQUAL ${CMAKE_PROJECT_NAME}) set(TOP_LEVEL TRUE) From dac88f52b8e492f3d6b09cff4d328ba35b5ec8fd Mon Sep 17 00:00:00 2001 From: Dedmen Miller Date: Mon, 26 Apr 2021 17:37:51 +0200 Subject: [PATCH 5/6] try to fix build --- lua-5.4.2/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua-5.4.2/CMakeLists.txt b/lua-5.4.2/CMakeLists.txt index 9b4cc76..c9a2477 100644 --- a/lua-5.4.2/CMakeLists.txt +++ b/lua-5.4.2/CMakeLists.txt @@ -34,7 +34,7 @@ set(LUA_LIB_SRCS ) if(LUA_BUILD_AS_CXX) - SET_SOURCE_FILES_PROPERTIES(${LUA_LIB_SRCS} PROPERTIES LANGUAGE CXX ) + set_source_files_properties(${LUA_LIB_SRCS} "src/lua.c" "src/luac.c" PROPERTIES LANGUAGE CXX ) endif() add_library(lua_static STATIC ${LUA_LIB_SRCS}) From aef1b83a9d5a1253b85daaa60a14c857cfa43691 Mon Sep 17 00:00:00 2001 From: Walter Schell Date: Mon, 26 Apr 2021 11:50:11 -0400 Subject: [PATCH 6/6] README.md: Updated to add status badges for C++ builds --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 0dae44d..c8d7b5e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # Lua CMake based build of Lua 5.4.2 -![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) +| Build as C | Build as C++ | +| --: | --: | +| ![Build Linux](https://github.com/walterschell/Lua/actions/workflows/build-linux.yml/badge.svg?branch=master) | ![Build Linux as C++](https://github.com/walterschell/Lua/actions/workflows/build-emscripten-cxx.yml/badge.svg?branch=master) | +| ![Build Windows](https://github.com/walterschell/Lua/actions/workflows/build-windows.yml/badge.svg?branch=master) | ![Build Windows as C++](https://github.com/walterschell/Lua/actions/workflows/build-windows-cxx.yml/badge.svg?branch=master) | +| ![Build OSX](https://github.com/walterschell/Lua/actions/workflows/build-osx.yml/badge.svg?branch=master) | ![Build OSX as C++](https://github.com/walterschell/Lua/actions/workflows/build-osx-cxx.yml/badge.svg?branch=master) | +| ![Build Emscripten](https://github.com/walterschell/Lua/actions/workflows/build-emscripten.yml/badge.svg?branch=master) | ![Build Emscripten as C++](https://github.com/walterschell/Lua/actions/workflows/build-emscripten-cxx.yml/badge.svg?branch=master) | # Usage Inside of your project's CMakeLists.txt ```cmake