From f0f43cf4264c68d638cd5920877d088c6c278435 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 26 Jul 2013 12:57:36 -0400 Subject: Fix build on late versions of cmake 2.4 --- modules/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 1e503d1c3..e9afbf45b 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -3,7 +3,7 @@ if(WIN32) add_definitions(-DMODULE_COMPILE) endif(WIN32) -function(build_modules SRC) +macro(build_modules SRC) if(NOT ${SRC} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} AND EXISTS "${SRC}/CMakeLists.txt") add_subdirectory("${SRC}") else(NOT ${SRC} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} AND EXISTS "${SRC}/CMakeLists.txt") @@ -76,9 +76,9 @@ function(build_modules SRC) endif(IS_DIRECTORY "${MODULE_SRC}") endforeach(MODULE_SRC ${MODULES_SRCS}) endif(NOT ${SRC} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR} AND EXISTS "${SRC}/CMakeLists.txt") -endfunction(build_modules) +endmacro(build_modules) -function(build_subdir) +macro(build_subdir) file(GLOB_RECURSE MODULES_SUBDIR_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp") sort_list(MODULES_SUBDIR_SRCS) @@ -159,7 +159,7 @@ function(build_subdir) install(TARGETS ${SO} DESTINATION ${LIB_DIR}/modules) endif(HAS_FUNCTION) -endfunction(build_subdir) +endmacro(build_subdir) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) build_modules(${CMAKE_CURRENT_SOURCE_DIR}) -- cgit