Intermediate static libs have issues.
Switch back to including the bundled expat sources directly in the targets, since transitive linking of static libs is very awkward. Makes static build happy again (let's see what else breaks)
This commit is contained in:
+2
-3
@@ -232,9 +232,8 @@ else()
|
||||
message(STATUS "Using built-in expat code")
|
||||
add_definitions(-DHAVE_EXPAT_CONFIG_H)
|
||||
set(EXPAT_INCLUDE_DIRS
|
||||
${PROJECT_SOURCE_DIR}/3rdparty/expat
|
||||
${PROJECT_BINARY_DIR}/3rdparty/expat)
|
||||
set(EXPAT_LIBRARIES local_expat)
|
||||
${PROJECT_SOURCE_DIR}/3rdparty/expat
|
||||
${PROJECT_BINARY_DIR}/3rdparty/expat)
|
||||
endif(SYSTEM_EXPAT)
|
||||
|
||||
include_directories(${EXPAT_INCLUDE_DIRS})
|
||||
|
||||
Reference in New Issue
Block a user