Skip to content

Commit e3fdbd4

Browse files
author
pradeep
committed
Remove name conflicts if forge is used as submodule
Also made some pkgcfg_lib variables advanced
1 parent 1de91d7 commit e3fdbd4

12 files changed

Lines changed: 39 additions & 35 deletions

CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ cmake_minimum_required(VERSION 3.5)
33
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules")
44
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/cmake")
55

6-
include(BuildType)
6+
include(ForgeBuildType)
77
include(FGInstallDirs)
8-
include(GetPrerequisites)
9-
include(InternalUtils)
10-
include(platform)
8+
include(ForgeInternalUtils)
9+
include(ForgePlatformSetup)
1110

1211
option(BUILD_SHARED_LIBS "Build shared/static library" ON)
1312
option(FG_ENABLE_HUNTER "Use Hunter cmake package handler" OFF)
@@ -27,7 +26,7 @@ endif()
2726

2827
project(Forge VERSION 1.0.2 LANGUAGES C CXX)
2928

30-
include(Version)
29+
include(ForgeVersion)
3130

3231
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
3332

@@ -174,3 +173,8 @@ include(CPackConfig)
174173

175174
conditional_directory(FG_BUILD_DOCS docs)
176175
conditional_directory(FG_BUILD_EXAMPLES examples)
176+
177+
mark_as_advanced(
178+
pkgcfg_lib_FontConfigPkg_freetype
179+
pkgcfg_lib_FontConfigPkg_fontconfig
180+
)

CMakeModules/CPackConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.5)
99

1010
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules/nsis")
1111

12-
include(Version)
12+
include(ForgeVersion)
1313
include(CPackIFW)
1414

1515
set(VENDOR_NAME "ArrayFire")

src/api/c/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
add_library(c_api_interface INTERFACE)
1+
add_library(forge_c_api_interface INTERFACE)
22

3-
target_sources(c_api_interface
3+
target_sources(forge_c_api_interface
44
INTERFACE
55
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/chart.cpp>
66
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/exception.cpp>
@@ -13,11 +13,11 @@ target_sources(c_api_interface
1313
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/window.cpp>
1414
)
1515

16-
target_include_directories(c_api_interface
16+
target_include_directories(forge_c_api_interface
1717
INTERFACE
18-
$<BUILD_INTERFACE:$<TARGET_PROPERTY:backend_interface,INTERFACE_INCLUDE_DIRECTORIES>>
18+
$<BUILD_INTERFACE:$<TARGET_PROPERTY:forge_backend_interface,INTERFACE_INCLUDE_DIRECTORIES>>
1919
)
2020

2121
if (NOT BUILD_SHARED_LIBS)
22-
install(TARGETS c_api_interface EXPORT ForgeTargets)
22+
install(TARGETS forge_c_api_interface EXPORT ForgeTargets)
2323
endif ()

src/api/cpp/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
add_library(cpp_api_interface INTERFACE)
1+
add_library(forge_cpp_api_interface INTERFACE)
22

3-
target_sources(cpp_api_interface
3+
target_sources(forge_cpp_api_interface
44
INTERFACE
55
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/chart.cpp>
66
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/error.hpp>
@@ -14,11 +14,11 @@ target_sources(cpp_api_interface
1414
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/window.cpp>
1515
)
1616

17-
target_include_directories(cpp_api_interface
17+
target_include_directories(forge_cpp_api_interface
1818
INTERFACE
1919
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
2020
)
2121

2222
if (NOT BUILD_SHARED_LIBS)
23-
install(TARGETS cpp_api_interface EXPORT ForgeTargets)
23+
install(TARGETS forge_cpp_api_interface EXPORT ForgeTargets)
2424
endif ()

src/backend/common/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
add_library(backend_interface INTERFACE)
1+
add_library(forge_backend_interface INTERFACE)
22

3-
target_sources(backend_interface
3+
target_sources(forge_backend_interface
44
INTERFACE
55
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/chart_common.hpp>
66
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/chart.hpp>
@@ -18,12 +18,12 @@ target_sources(backend_interface
1818
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/window.hpp>
1919
)
2020

21-
target_include_directories(backend_interface
21+
target_include_directories(forge_backend_interface
2222
INTERFACE
2323
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
2424
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
2525
)
2626

2727
if (NOT BUILD_SHARED_LIBS)
28-
install(TARGETS backend_interface EXPORT ForgeTargets)
28+
install(TARGETS forge_backend_interface EXPORT ForgeTargets)
2929
endif ()

src/backend/opengl/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,10 @@ target_link_libraries(${BackendTarget}
9494
$<$<NOT:$<CONFIG:Release>>:glbinding::glbinding-aux>
9595
glm
9696
Boost::boost
97-
backend_interface
98-
wtk_interface
99-
c_api_interface
100-
cpp_api_interface
97+
forge_backend_interface
98+
forge_wtk_interface
99+
forge_c_api_interface
100+
forge_cpp_api_interface
101101
)
102102
if (FG_ENABLE_HUNTER)
103103
target_link_libraries(${BackendTarget} PRIVATE freetype::freetype)

0 commit comments

Comments
 (0)