From Rafa Gaitan, "I have added the macro SETUP_LIBRARY, similar to SETUP_PLUGIN or
SETUP_EXE, in order to have a unique entry point to build the libraries. With this changes the android integration will be less painful (currently is a big IF(ANDROID) for each CMakeLists.txt) and more maintainable in the future. I hope next submissions will be for supporting android from my colleague Jorge. "
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
# Required Vars:
|
||||
# ${LIB_NAME}
|
||||
# ${LIB_PUBLIC_HEADERS}
|
||||
# ${TARGET_H}
|
||||
|
||||
SET(INSTALL_INCDIR include)
|
||||
SET(INSTALL_BINDIR bin)
|
||||
@@ -18,7 +18,7 @@ SET(HEADERS_GROUP "Header Files")
|
||||
|
||||
SOURCE_GROUP(
|
||||
${HEADERS_GROUP}
|
||||
FILES ${LIB_PUBLIC_HEADERS}
|
||||
FILES ${TARGET_H}
|
||||
)
|
||||
|
||||
IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
|
||||
@@ -34,7 +34,7 @@ INSTALL(
|
||||
|
||||
IF(NOT OSG_COMPILE_FRAMEWORKS)
|
||||
INSTALL (
|
||||
FILES ${LIB_PUBLIC_HEADERS}
|
||||
FILES ${TARGET_H}
|
||||
DESTINATION ${INSTALL_INCDIR}/${LIB_NAME}
|
||||
COMPONENT libopenscenegraph-dev
|
||||
)
|
||||
@@ -45,7 +45,7 @@ ELSE()
|
||||
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES
|
||||
FRAMEWORK TRUE
|
||||
FRAMEWORK_VERSION ${OPENSCENEGRAPH_SOVERSION}
|
||||
PUBLIC_HEADER "${LIB_PUBLIC_HEADERS}"
|
||||
PUBLIC_HEADER "${TARGET_H}"
|
||||
INSTALL_NAME_DIR "${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}"
|
||||
)
|
||||
# MESSAGE("${OSG_COMPILE_FRAMEWORKS_INSTALL_NAME_DIR}")
|
||||
|
||||
Reference in New Issue
Block a user