mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-02-09 16:49:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revise AutoInclude.cmake: My version of CMake, despite being >=2.8.11, doesn't actually support CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE."

Browse Source 
This reverts commit 6a38e3c95df00da728cbd253c0bf80c22d0c419b.
This commit is contained in:
Sam Edwards
2014-01-30 13:47:44 -07:00
parent 33142e0b59
commit cebdcd1d43
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmake/modules/AutoInclude.cmake
View File

@@ -4,12 +4,8 @@
# behavior by default.
#
# Emulate CMake 2.8.11's CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE behavior if
# this version doesn't define CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE.
# CFSworks's version of CMake (2.8.12) doesn't have
# CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE even though it should be supported,
# hence test if it's defined (as either ON or OFF) before trying to use it.
if("${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}" STREQUAL "")
# Emulate CMake 2.8.11's CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE behavior.
if(CMAKE_VERSION VERSION_LESS 2.8.11)
# Replace some built-in functions in order to extend their functionality.
function(add_library target)
_add_library(${target} ${ARGN})
@@ -33,16 +29,14 @@ if("${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}" STREQUAL "")
endif()
endforeach()
if(interface_dirs)
list(REMOVE_DUPLICATES interface_dirs)
list(REMOVE_DUPLICATES interface_dirs)
#NB. target_include_directories is new in 2.8.8.
#target_include_directories("${target}" ${interface_dirs})
include_directories(${interface_dirs})
#NB. target_include_directories is new in 2.8.8.
#target_include_directories("${target}" ${interface_dirs})
include_directories(${interface_dirs})
# Update this target's interface inc dirs.
set_target_properties("${target}" PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${target_interface_dirs};${interface_dirs}")
endif()
# Update this target's interface inc dirs.
set_target_properties("${target}" PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${target_interface_dirs};${interface_dirs}")
# Call to the built-in function we are overriding.
_target_link_libraries(${target} ${ARGN})