fix: lua linking.

jochumdev · jochumdev · commit 697978f09d61 · 2024-10-14T23:41:36.000+02:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,7 +48,6 @@ target_link_libraries (${PROJECT_NAME}
     lib3ds
     7zip
 
-    lua
     minizip-ng
     spdlog
     simdutf::simdutf
@@ -58,11 +57,12 @@ target_link_libraries (${PROJECT_NAME}
 )
 
 target_link_libraries (${PROJECT_NAME}
+    ${LUA_LIBRARIES}
     ${Boost_LIBRARIES}
 )
 
 target_include_directories(${PROJECT_NAME}
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${LUA_INCLUDE_DIR}"
+    PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${LUA_INCLUDE_DIR}"
 )
 
 if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
diff --git a/src/swig/CMakeLists.txt b/src/swig/CMakeLists.txt
@@ -15,8 +15,8 @@ swig_add_library(upspring
 )
 
 target_include_directories(upspring
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/.."
-    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${LUA_INCLUDE_DIR}"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/.." "${LUA_INCLUDE_DIR}"
+    PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 set_target_properties(upspring PROPERTIES

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ target_link_libraries (${PROJECT_NAME}`
`48`	`48`	`lib3ds`
`49`	`49`	`7zip`
`50`	`50`
`51`		`- lua`
`52`	`51`	`minizip-ng`
`53`	`52`	`spdlog`
`54`	`53`	`simdutf::simdutf`
`@@ -58,11 +57,12 @@ target_link_libraries (${PROJECT_NAME}`
`58`	`57`	`)`
`59`	`58`
`60`	`59`	`target_link_libraries (${PROJECT_NAME}`
	`60`	`+ ${LUA_LIBRARIES}`
`61`	`61`	`${Boost_LIBRARIES}`
`62`	`62`	`)`
`63`	`63`
`64`	`64`	`target_include_directories(${PROJECT_NAME}`
`65`		`- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${LUA_INCLUDE_DIR}"`
	`65`	`+ PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}" "${LUA_INCLUDE_DIR}"`
`66`	`66`	`)`
`67`	`67`
`68`	`68`	`if ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@ swig_add_library(upspring`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`target_include_directories(upspring`
`18`		`- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/.."`
`19`		`- PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}" "${LUA_INCLUDE_DIR}"`
	`18`	`+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/.." "${LUA_INCLUDE_DIR}"`
	`19`	`+ PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`set_target_properties(upspring PROPERTIES`