Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

added: allow core extension dirs

         : external example dir support
    fixed: contrib prepare filename
         : setup for dirs relative to an external contrib dir



git-svn-id: https://external.lite3d.com/opensg/svn_repo/trunk@2272 4683daeb-ad0f-0410-a623-93161e962ae5
  • Loading branch information...
commit f47cb09e637c2b7f647df245e383f00c99ac4dfb 1 parent 06d3482
vossg authored
View
5 CMake/BuildFunctions.cmake
@@ -1178,6 +1178,11 @@ ENDFUNCTION(OSG_SETUP_DOXYDOC)
# perform default actions for build passes
FUNCTION(OSG_SETUP_PROJECT PROJ_DEFINE)
+
+ FOREACH(_OSG_${PROJECT_NAME}_EXT_DIR ${${PROJECT_NAME}_EXT_DIRS})
+ OSG_ADD_DIRECTORY(${_OSG_${PROJECT_NAME}_EXT_DIR})
+ ENDFOREACH(_OSG_${PROJECT_NAME}_EXT_DIR ${${PROJECT_NAME}_EXT_DIRS})
+
IF(OSG_CMAKE_PASS STREQUAL "OSGSETUP")
OSG_SETUP_LIBRARY_BUILD(${PROJ_DEFINE})
View
12 CMake/ConfigurePackages.cmake
@@ -497,6 +497,10 @@ MACRO(OSG_CONFIGURE_BOOST)
IF(Boost_FOUND)
+ IF(${Boost_MINOR_VERSION} GREATER 34)
+ FIND_PACKAGE(Boost COMPONENTS system)
+ ENDIF(${Boost_MINOR_VERSION} GREATER 34)
+
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR} )
IF(UNIX)
@@ -510,11 +514,19 @@ MACRO(OSG_CONFIGURE_BOOST)
IF(CMAKE_BUILD_TYPE STREQUAL "Debug" OR
CMAKE_BUILD_TYPE STREQUAL "DebugOpt")
+ IF(${Boost_MINOR_VERSION} GREATER 34)
+ SET(OSG_BOOST_LIBS ${Boost_FILESYSTEM_LIBRARY_DEBUG} ${Boost_SYSTEM_LIBRARY_DEBUG})
+ ELSE()
SET(OSG_BOOST_LIBS ${Boost_FILESYSTEM_LIBRARY_DEBUG})
+ ENDIF(${Boost_MINOR_VERSION} GREATER 34)
ELSE()
+ IF(${Boost_MINOR_VERSION} GREATER 34)
+ SET(OSG_BOOST_LIBS ${Boost_FILESYSTEM_LIBRARY_RELEASE} ${Boost_SYSTEM_LIBRARY_RELEASE})
+ ELSE()
SET(OSG_BOOST_LIBS ${Boost_FILESYSTEM_LIBRARY_RELEASE})
+ ENDIF(${Boost_MINOR_VERSION} GREATER 34)
ENDIF()
View
20 CMakeLists.txt
@@ -569,10 +569,10 @@ IF(NOT OSG_BUILD_DEPENDEND)
ENDIF(NOT OSG_BUILD_DEPENDEND)
FOREACH(EXTERNAL_CONFIG ${OSG_EXTERNAL_CONFIGS})
- IF(EXISTS ${OSG_${EXTERNAL_CONFIG}_SOURCE_DIR}/Prepare${EXTERNAL_CONFIG}.cmake)
- INCLUDE(${OSG_${EXTERNAL_CONFIG}_SOURCE_DIR}/Prepare${EXTERNAL_CONFIG}.cmake)
+ IF(EXISTS ${OSG_${EXTERNAL_CONFIG}_SOURCE_DIR}/${EXTERNAL_CONFIG}.Prepare.cmake)
+ INCLUDE(${OSG_${EXTERNAL_CONFIG}_SOURCE_DIR}/${EXTERNAL_CONFIG}.Prepare.cmake)
ENDIF(EXISTS
- ${OSG_${EXTERNAL_CONFIG}_SOURCE_DIR}/Prepare${EXTERNAL_CONFIG}.cmake)
+ ${OSG_${EXTERNAL_CONFIG}_SOURCE_DIR}/${EXTERNAL_CONFIG}.Prepare.cmake)
ENDFOREACH(EXTERNAL_CONFIG ${OSG_EXTERNAL_CONFIGS})
IF(OSG_GLOBAL_PREP AND EXISTS ${OSG_GLOBAL_PREP})
@@ -736,6 +736,20 @@ ENDIF(DOXYGEN_EXECUTABLE)
# Passes
###############
+FOREACH(_OSGCORE_EXT_DIR ${OSG_CORE_EXTENSIONS})
+ MESSAGE(STATUS "processing core ext : ${_OSGCORE_EXT_DIR}")
+
+ FILE(GLOB_RECURSE _OSG_LIBRARY_EXT_CONFIG_FILES
+ "${_OSGCORE_EXT_DIR}/*CMakeLists.Extension.*.txt")
+
+ FOREACH(_OSGCORE_EXT_FILE ${_OSG_LIBRARY_EXT_CONFIG_FILES})
+ MESSAGE(STATUS " Found and process ${_OSGCORE_EXT_FILE}")
+ INCLUDE(${_OSGCORE_EXT_FILE})
+ ENDFOREACH(_OSGCORE_EXT_FILE ${OSG_LIBRARY_EXT_CONFIG_FILES})
+
+
+ENDFOREACH(_OSGCORE_EXT_DIR ${OSG_CORE_EXTENSIONS})
+
# Find files describing libraries to build, but make sure base
# and system are processed first
FILE(GLOB_RECURSE OSG_LIBRARY_CONFIG_FILE_BASE RELATIVE "${CMAKE_SOURCE_DIR}"
Please sign in to comment.
Something went wrong with that request. Please try again.