From 38c0ccda53ed6198f388fde5495b955e8b7f29f6 Mon Sep 17 00:00:00 2001
From: Sudheer Hebbale <sudheer.hr@tekenlight.com>
Date: Thu, 11 Jul 2024 10:54:25 +0000
Subject: [PATCH 1/2] modified cmake build to pick python3 if available else
 pick python2

---
 CMakeLists.txt     | 60 ++++++++++++++++++++++------------------------
 src/CMakeLists.txt | 38 ++++++++++++++---------------
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1422914..10af951 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,31 +1,29 @@
-cmake_minimum_required(VERSION 3.0.0)
-
-set(CMAKE_BUILD_TYPE_INIT "Release")
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
-
-
-project(Lunatic)
-
-find_package(Lua        5.1 REQUIRED)
-find_package(PythonLibs 2.7 REQUIRED)
-
-
-add_subdirectory(src)
-
-add_library(python MODULE $<TARGET_OBJECTS:src>)
-set_target_properties(python PROPERTIES 
-                             PREFIX "")
-
-add_library(lua MODULE $<TARGET_OBJECTS:src>)
-if (WIN32)
-  set_target_properties(lua PROPERTIES 
-                            PREFIX ""
-                            SUFFIX ".pyd")
-else (WIN32)
-  set_target_properties(lua PROPERTIES 
-                            PREFIX "")
-endif (WIN32)
-
-target_link_libraries(lua     ${LUA_LIBRARIES} ${PYTHON_LIBRARIES})
-target_link_libraries(python  ${LUA_LIBRARIES} ${PYTHON_LIBRARIES})
+cmake_minimum_required(VERSION 3.0.0)
+
+set(CMAKE_BUILD_TYPE_INIT "Release")
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
+
+project(Lunatic)
+
+find_package(Lua        5.1 REQUIRED)
+find_package(Python REQUIRED COMPONENTS Interpreter Development)
+
+add_subdirectory(src)
+
+add_library(python MODULE $<TARGET_OBJECTS:src>)
+set_target_properties(python PROPERTIES
+                             PREFIX "")
+
+add_library(lua MODULE $<TARGET_OBJECTS:src>)
+if (WIN32)
+  set_target_properties(lua PROPERTIES
+                            PREFIX ""
+                            SUFFIX ".pyd")
+else (WIN32)
+  set_target_properties(lua PROPERTIES
+                            PREFIX "")
+endif (WIN32)
+
+target_link_libraries(lua     ${LUA_LIBRARIES} ${Python_LIBRARIES})
+target_link_libraries(python  ${LUA_LIBRARIES} ${Python_LIBRARIES})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38c58a9..3c84b54 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,19 +1,19 @@
-add_library(src OBJECT luainpython.c pythoninlua.c)
-set_target_properties(src PROPERTIES 
-                          POSITION_INDEPENDENT_CODE TRUE)
-
-target_include_directories(src PRIVATE ${LUA_INCLUDE_DIR} ${PYTHON_INCLUDE_DIR})
-
-target_compile_definitions(src PRIVATE LUA_LIB)
-if (WIN32)
-  target_compile_definitions(src PRIVATE LUA_BUILD_AS_DLL)
-endif (WIN32)
-
-if (UNIX)
-  get_filename_component(PYTHON_LIBRT ${PYTHON_LIBRARIES} NAME)
-  target_compile_definitions(src PRIVATE PYTHON_LIBRT=${PYTHON_LIBRT})
-endif (UNIX)
-
-if (CMAKE_COMPILER_IS_GNUCC)
-  target_compile_options(src PUBLIC -Wall -pedantic -std=c99)
-endif (CMAKE_COMPILER_IS_GNUCC)
+add_library(src OBJECT luainpython.c pythoninlua.c)
+set_target_properties(src PROPERTIES
+                          POSITION_INDEPENDENT_CODE TRUE)
+
+target_include_directories(src PRIVATE ${LUA_INCLUDE_DIR} ${Python_INCLUDE_DIRS})
+
+target_compile_definitions(src PRIVATE LUA_LIB)
+if (WIN32)
+  target_compile_definitions(src PRIVATE LUA_BUILD_AS_DLL)
+endif (WIN32)
+
+if (UNIX)
+  get_filename_component(PYTHON_LIBRT ${Python_LIBRARIES} NAME)
+  target_compile_definitions(src PRIVATE PYTHON_LIBRT=${PYTHON_LIBRT})
+endif (UNIX)
+
+if (CMAKE_COMPILER_IS_GNUCC)
+  target_compile_options(src PUBLIC -Wall -pedantic -std=c99)
+endif (CMAKE_COMPILER_IS_GNUCC)

From f875b166f1ff9d5e3e2dd843561bee6c74a07558 Mon Sep 17 00:00:00 2001
From: Sudheer Hebbale <sudheer.hr@tekenlight.com>
Date: Fri, 12 Jul 2024 04:59:05 +0000
Subject: [PATCH 2/2] Changed minimum cmake version to 3.12

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10af951..9dabdfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.12.0)
 
 set(CMAKE_BUILD_TYPE_INIT "Release")
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)