Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

Commit 2e595fd0 authored by Artur Grunau's avatar Artur Grunau
Browse files

Scripting: fixes related to building shared libs

Now that BUILD_SHARED_LIBS is a top-level CAMPVis option, we could take
advantage of that and make the way we build Lua more robust. Also,
campvis-scripting has been marked as static library to prevent the build
from failing when BUILD_SHARED_LIBS is set.

References #1
parent 497b2b38
......@@ -48,13 +48,12 @@ IF(CAMPVIS_BUILD_LIB_TGT)
ENDIF()
IF(CAMPVIS_BUILD_LIB_LUA)
# Lua's CMakeLists.txt enables BUILD_SHARED_LIBS if it isn't explicitly disabled. This breaks
# the build as CMake tries and fails to build all of CAMPVis' libraries as shared libraries.
# Disable BUILD_SHARED_LIBS before including `ext/lua` to prevent that.
#
# TODO: this is a temporary fix; we'd like to eventually build Lua and at least some of CAMPVis'
# libraries as shared libraries
SET(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
# Keep LUA_BUILD_AS_DLL in sync with BUILD_SHARED_LIBS
SET(LUA_BUILD_AS_DLL ${BUILD_SHARED_LIBS} CACHE BOOL "Build Lua library as DLL" FORCE)
# Disable features we don't need
SET(LUA_BUILD_WLUA OFF CACHE BOOL "Build wLua interpreter without console output")
ADD_SUBDIRECTORY(ext/lua)
ENDIF()
......
......@@ -122,7 +122,7 @@ ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisScriptingDefinitions})
INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CMAKE_CURRENT_BINARY_DIR})
TARGET_LINK_LIBRARIES(campvis-scripting-test campvis-core campvis-modules tgt ${CampvisGlobalExternalLibs})
ADD_LIBRARY(campvis-scripting
ADD_LIBRARY(campvis-scripting STATIC
${CampvisScriptingSources} ${CampvisScriptingHeaders}
)
ADD_DEPENDENCIES(campvis-scripting ${CampvisLuaModules})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment