Skip to content

Commit 4fd7231

Browse files
Przemog1Przemog1
committed
Renamed functions in CMake files
1 parent e89b27b commit 4fd7231

File tree

57 files changed

+114
-114
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+114
-114
lines changed

‎3rdparty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ if(_NBL_COMPILE_WITH_GLI_)
185185
set(BUILD_TESTING ${_OLD_BUILD_TESTING})
186186
endif()
187187

188-
irr_adjust_flags()
188+
nbl_adjust_flags()
189189

190190
add_library(lzma OBJECT
191191
lzma/C/Alloc.c

‎CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ else()
7878
set(NBL_PARALLEL_BUILD_JOBS 8)
7979
endif()
8080

81-
macro(irr_adjust_flags)
81+
macro(nbl_adjust_flags)
8282
option(NBL_GCC_SANITIZE_ADDRESS OFF)
8383
option(NBL_GCC_SANITIZE_THREAD OFF)
8484

@@ -159,7 +159,7 @@ macro(irr_adjust_flags)
159159
endif()
160160
endmacro()
161161

162-
macro(irr_adjust_definitions)
162+
macro(nbl_adjust_definitions)
163163
add_definitions(
164164
-DPNG_THREAD_UNSAFE_OK
165165
-DPNG_NO_MMX_CODE

‎cmake/common.cmake

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endfunction()
2828
# Macro creating project for an executable
2929
# Project and target get its name from directory when this macro gets executed (truncating number in the beginning of the name and making all lower case)
3030
# Created because of common cmake code for examples and tools
31-
macro(irr_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDES _EXTRA_LIBS)
31+
macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDES _EXTRA_LIBS)
3232
get_filename_component(EXECUTABLE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
3333
string(REGEX REPLACE "^[0-9]+\." "" EXECUTABLE_NAME ${EXECUTABLE_NAME})
3434
string(TOLOWER ${EXECUTABLE_NAME} EXECUTABLE_NAME)
@@ -75,8 +75,8 @@ macro(irr_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
7575
endif()
7676

7777
# https://github.com/buildaworldnet/IrrlichtBAW/issues/298 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
78-
irr_adjust_flags() # macro defined in root CMakeLists
79-
irr_adjust_definitions() # macro defined in root CMakeLists
78+
nbl_adjust_flags() # macro defined in root CMakeLists
79+
nbl_adjust_definitions() # macro defined in root CMakeLists
8080

8181
set_target_properties(${EXECUTABLE_NAME} PROPERTIES DEBUG_POSTFIX _d)
8282
set_target_properties(${EXECUTABLE_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX _rwdi)
@@ -154,7 +154,7 @@ macro(irr_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
154154
endif()
155155
endmacro()
156156

157-
macro(irr_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUDES LIB_OPTIONS)
157+
macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUDES LIB_OPTIONS)
158158
set(LIB_NAME "IrrExt${EXT_NAME}")
159159
project(${LIB_NAME})
160160

@@ -187,8 +187,8 @@ macro(irr_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUD
187187
endif()
188188

189189
# https://github.com/buildaworldnet/IrrlichtBAW/issues/298 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1
190-
irr_adjust_flags() # macro defined in root CMakeLists
191-
irr_adjust_definitions() # macro defined in root CMakeLists
190+
nbl_adjust_flags() # macro defined in root CMakeLists
191+
nbl_adjust_definitions() # macro defined in root CMakeLists
192192

193193
set_target_properties(${LIB_NAME} PROPERTIES DEBUG_POSTFIX _d)
194194
set_target_properties(${LIB_NAME} PROPERTIES RELWITHDEBINFO_POSTFIX _rwdb)
@@ -253,15 +253,15 @@ endmacro()
253253

254254
# End of TODO, rest are all functions
255255

256-
function(irr_get_conf_dir _OUTVAR _CONFIG)
256+
function(nbl_get_conf_dir _OUTVAR _CONFIG)
257257
string(TOLOWER ${_CONFIG} CONFIG)
258258
set(${_OUTVAR} "${CMAKE_BINARY_DIR}/include/nbl/config/${CONFIG}" PARENT_SCOPE)
259259
endfunction()
260260

261261

262262
# function for installing header files preserving directory structure
263263
# _DEST_DIR is directory relative to CMAKE_INSTALL_PREFIX
264-
function(irr_install_headers _HEADERS _BASE_HEADERS_DIR)
264+
function(nbl_install_headers _HEADERS _BASE_HEADERS_DIR)
265265
foreach (file ${_HEADERS})
266266
file(RELATIVE_PATH dir ${_BASE_HEADERS_DIR} ${file})
267267
get_filename_component(dir ${dir} DIRECTORY)
@@ -271,10 +271,10 @@ function(irr_install_headers _HEADERS _BASE_HEADERS_DIR)
271271
endforeach()
272272
endfunction()
273273

274-
function(irr_install_config_header _CONF_HDR_NAME)
275-
irr_get_conf_dir(dir_deb Debug)
276-
irr_get_conf_dir(dir_rel Release)
277-
irr_get_conf_dir(dir_relWithDebInfo RelWithDebInfo)
274+
function(nbl_install_config_header _CONF_HDR_NAME)
275+
nbl_get_conf_dir(dir_deb Debug)
276+
nbl_get_conf_dir(dir_rel Release)
277+
nbl_get_conf_dir(dir_relWithDebInfo RelWithDebInfo)
278278
set(file_deb "${dir_deb}/${_CONF_HDR_NAME}")
279279
set(file_rel "${dir_rel}/${_CONF_HDR_NAME}")
280280
set(file_relWithDebInfo "${dir_relWithDebInfo}/${_CONF_HDR_NAME}")

‎examples_tests/01.HelloWorld/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

‎examples_tests/02.ComputeShader/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

‎examples_tests/03.GPU_Mesh/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

‎examples_tests/05.IrrlichtBaWTutorialExample/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

‎examples_tests/06.MeshLoaders/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

‎examples_tests/07.HardwareSkinning/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

‎examples_tests/08.HardwareInstancing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if(NOT RES)
44
message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
55
endif()
66

7-
irr_create_executable_project("" "" "" "")
7+
nbl_create_executable_project("" "" "" "")

0 commit comments

Comments
 (0)