Rename CMake files to prevent name collisions

When consumed as a subproject, the CMake files could be imported into the parent project where the filenames could collide.
dyninst · Dec 2, 2022 · a1a8ace · a1a8ace
1 parent f7b2fc1
commit a1a8ace
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,20 +27,20 @@ set(CMAKE_MODULE_PATH "${DYNINST_ROOT}/cmake" "${DYNINST_ROOT}/cmake/Modules"
                       ${CMAKE_MODULE_PATH})
 
 # Set the C and C++ language standards
-include(LanguageStandards)
+include(DyninstLanguageStandards)
 
 # Find the necessary third-party libraries
-find_package(ThreadDB)
+find_package(Thread_DB)
 find_package(Threads)
-include(Boost)
-include(ThreadingBuildingBlocks)
-include(ElfUtils)
+include(DyninstBoost)
+include(DyninstTBB)
+include(DyninstElfUtils)
 
 if(UNIX)
-    include(LibIberty REQUIRED)
+    include(DyninstLibIberty REQUIRED)
 endif()
 
-include(shared)
+include(DyninstLibrary)
 
 if(USE_OpenMP)
     find_package(OpenMP REQUIRED)

diff --git a/cmake/cap_arch_def.cmake → cmake/DyninstCapArchDef.cmake b/cmake/cap_arch_def.cmake → cmake/DyninstCapArchDef.cmake
diff --git a/cmake/LanguageStandards.cmake → cmake/DyninstLanguageStandards.cmake b/cmake/LanguageStandards.cmake → cmake/DyninstLanguageStandards.cmake
diff --git a/cmake/shared.cmake → cmake/DyninstLibrary.cmake b/cmake/shared.cmake → cmake/DyninstLibrary.cmake
@@ -100,12 +100,12 @@ function(dyninst_library target)
         DESTINATION "${INSTALL_CMAKE_DIR}")
 endfunction()
 
-include(${DYNINST_ROOT}/cmake/platform.cmake)
-include(${DYNINST_ROOT}/cmake/cap_arch_def.cmake)
-include(${DYNINST_ROOT}/cmake/visibility.cmake)
-include(${DYNINST_ROOT}/cmake/warnings.cmake)
-include(${DYNINST_ROOT}/cmake/options.cmake)
-include(${DYNINST_ROOT}/cmake/optimization.cmake)
+include(DyninstPlatform)
+include(DyninstCapArchDef)
+include(DyninstVisibility)
+include(DyninstWarnings)
+include(DyninstOptions)
+include(DyninstOptimization)
 
 set(BUILD_SHARED_LIBS ON)
 

diff --git a/cmake/optimization.cmake → cmake/DyninstOptimization.cmake b/cmake/optimization.cmake → cmake/DyninstOptimization.cmake
diff --git a/cmake/options.cmake → cmake/DyninstOptions.cmake b/cmake/options.cmake → cmake/DyninstOptions.cmake
diff --git a/cmake/DyninstPlatform.cmake b/cmake/DyninstPlatform.cmake
@@ -0,0 +1,5 @@
+if(UNIX)
+    include(DyninstPlatformUnix)
+else()
+    include(DyninstPlatformWindows)
+endif()
diff --git a/cmake/platform_unix.cmake → cmake/DyninstPlatformUnix.cmake b/cmake/platform_unix.cmake → cmake/DyninstPlatformUnix.cmake
diff --git a/cmake/platform_windows.cmake → cmake/DyninstPlatformWindows.cmake b/cmake/platform_windows.cmake → cmake/DyninstPlatformWindows.cmake
diff --git a/cmake/Modules/DyninstSystemPaths.cmake → cmake/DyninstSystemPaths.cmake b/cmake/Modules/DyninstSystemPaths.cmake → cmake/DyninstSystemPaths.cmake
diff --git a/cmake/visibility.cmake → cmake/DyninstVisibility.cmake b/cmake/visibility.cmake → cmake/DyninstVisibility.cmake
diff --git a/cmake/warnings.cmake → cmake/DyninstWarnings.cmake b/cmake/warnings.cmake → cmake/DyninstWarnings.cmake
diff --git a/cmake/Modules/FindThreadDB.cmake → cmake/Modules/FindThread_DB.cmake b/cmake/Modules/FindThreadDB.cmake → cmake/Modules/FindThread_DB.cmake
diff --git a/cmake/platform.cmake b/cmake/platform.cmake
diff --git a/cmake/Boost.cmake → cmake/tpls/DyninstBoost.cmake b/cmake/Boost.cmake → cmake/tpls/DyninstBoost.cmake
diff --git a/cmake/ElfUtils.cmake → cmake/tpls/DyninstElfUtils.cmake b/cmake/ElfUtils.cmake → cmake/tpls/DyninstElfUtils.cmake
diff --git a/cmake/LibIberty.cmake → cmake/tpls/DyninstLibIberty.cmake b/cmake/LibIberty.cmake → cmake/tpls/DyninstLibIberty.cmake
diff --git a/cmake/ThreadingBuildingBlocks.cmake → cmake/tpls/DyninstTBB.cmake b/cmake/ThreadingBuildingBlocks.cmake → cmake/tpls/DyninstTBB.cmake
@@ -191,7 +191,7 @@ else()
         INSTALL_COMMAND
             ${CMAKE_COMMAND} -DLIBDIR=${TBB_LIBRARY_DIRS} -DINCDIR=${TBB_INCLUDE_DIRS}
             -DPREFIX=${_tbb_prefix_dir} -P
-            ${CMAKE_CURRENT_LIST_DIR}/ThreadingBuildingBlocks.install.cmake)
+            ${PROJECT_SOURCE_DIR}/cmake/tpls/DyninstTBBInstall.cmake)
 endif()
 
 include_directories(SYSTEM ${TBB_INCLUDE_DIRS})

diff --git a/cmake/ThreadingBuildingBlocks.install.cmake → cmake/tpls/DyninstTBBInstall.cmake b/cmake/ThreadingBuildingBlocks.install.cmake → cmake/tpls/DyninstTBBInstall.cmake