archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

added back include file globbing for cmake, thought this was needed for MSVC only but turns out QtCreator also needs this else it wont index headers.

Browse Source
This commit is contained in:
Campbell Barton
2010-11-05 04:18:53 +00:00
parent f0b01220e5
commit 36b8ebceb5
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
build_files/cmake/macros.cmake
View File

@@ -1,45 +1,44 @@
IF(MSVC)
# only MSVC uses SOURCE_GROUP
MACRO(BLENDERLIB_NOLIST
name
sources
includes)
# only MSVC uses SOURCE_GROUP
MACRO(BLENDERLIB_NOLIST
name
sources
includes)
MESSAGE(STATUS "Configuring library ${name}")
MESSAGE(STATUS "Configuring library ${name}")
# Gather all headers
FILE(GLOB_RECURSE INC_ALL *.h)
INCLUDE_DIRECTORIES(${includes})
ADD_LIBRARY(${name} ${INC_ALL} ${sources})
# Gather all headers
FILE(GLOB_RECURSE INC_ALL *.h)
INCLUDE_DIRECTORIES(${includes})
ADD_LIBRARY(${name} ${INC_ALL} ${sources})
# Group by location on disk
SOURCE_GROUP(Files FILES CMakeLists.txt)
SET(ALL_FILES ${sources} ${INC_ALL})
FOREACH(SRC ${ALL_FILES})
STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
IF(REL_DIR)
SOURCE_GROUP(${REL_DIR} FILES ${SRC})
ELSE(REL_DIR)
SOURCE_GROUP(Files FILES ${SRC})
ENDIF(REL_DIR)
ENDFOREACH(SRC)
ENDMACRO(BLENDERLIB_NOLIST)
ELSE(MSVC)
# Group by location on disk
SOURCE_GROUP(Files FILES CMakeLists.txt)
SET(ALL_FILES ${sources} ${INC_ALL})
FOREACH(SRC ${ALL_FILES})
STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
IF(REL_DIR)
SOURCE_GROUP(${REL_DIR} FILES ${SRC})
ELSE(REL_DIR)
SOURCE_GROUP(Files FILES ${SRC})
ENDIF(REL_DIR)
ENDFOREACH(SRC)
ENDMACRO(BLENDERLIB_NOLIST)
MACRO(BLENDERLIB_NOLIST
name
sources
includes)
# # works fine but having the includes listed is helpful for IDE's (QtCreator/MSVC)
# MACRO(BLENDERLIB_NOLIST
# name
# sources
# includes)
#
# MESSAGE(STATUS "Configuring library ${name}")
# INCLUDE_DIRECTORIES(${includes})
# ADD_LIBRARY(${name} ${sources})
# ENDMACRO(BLENDERLIB_NOLIST)
MESSAGE(STATUS "Configuring library ${name}")
INCLUDE_DIRECTORIES(${includes})
ADD_LIBRARY(${name} ${sources})
ENDMACRO(BLENDERLIB_NOLIST)
ENDIF(MSVC)
MACRO(BLENDERLIB
name