GHI #18 Move cmake helpers out of utils subdir

doodspav · Jun 16, 2023 · ae97acb · ae97acb
1 parent 547b2ef
commit ae97acb
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-include(cmake/util/PreventInSourceBuilds.cmake)
+include(cmake/PreventInSourceBuilds.cmake)
 
 project(
     patomic
@@ -11,8 +11,8 @@ project(
 )
 
 # don't change include order, OptionVariables checks if project is top level
-include(cmake/util/ProjectIsTopLevel.cmake)
-include(cmake/util/OptionVariables.cmake)
+include(cmake/ProjectIsTopLevel.cmake)
+include(cmake/OptionVariables.cmake)
 
 
 # ---- Declare Library ----
@@ -77,7 +77,7 @@ target_compile_features(patomic_patomic PUBLIC c_std_90)
 # ---- Install Rules ----
 
 if(NOT CMAKE_SKIP_INSTALL_RULES)
-    include(cmake/util/InstallRules.cmake)
+    include(cmake/InstallRules.cmake)
 endif()
 
 

diff --git a/cmake/util/InstallConfig.cmake → cmake/InstallConfig.cmake b/cmake/util/InstallConfig.cmake → cmake/InstallConfig.cmake
diff --git a/cmake/util/InstallRules.cmake → cmake/InstallRules.cmake b/cmake/util/InstallRules.cmake → cmake/InstallRules.cmake
@@ -7,7 +7,7 @@ set(package patomic)
 # copy header files to CMAKE_INSTALL_INCLUDEDIR
 install(
     DIRECTORY
-    "${PROJECT_SOURCE_DIR}/include/"
+    "../include"
     "${PROJECT_BINARY_DIR}/include/"
     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
     COMPONENT patomic_Development
@@ -30,7 +30,7 @@ install(
 
 # copy config file for find_package to find
 install(
-    FILES "${PROJECT_SOURCE_DIR}/cmake/util/InstallConfig.cmake"
+    FILES "InstallConfig.cmake"
     DESTINATION "${PATOMIC_INSTALL_CMAKEDIR}"
     RENAME "${package}Config.cmake"
     COMPONENT patomic_Development

diff --git a/cmake/util/OptionVariables.cmake → cmake/OptionVariables.cmake b/cmake/util/OptionVariables.cmake → cmake/OptionVariables.cmake
diff --git a/cmake/util/PreventInSourceBuilds.cmake → cmake/PreventInSourceBuilds.cmake b/cmake/util/PreventInSourceBuilds.cmake → cmake/PreventInSourceBuilds.cmake
diff --git a/cmake/util/ProjectIsTopLevel.cmake → cmake/ProjectIsTopLevel.cmake b/cmake/util/ProjectIsTopLevel.cmake → cmake/ProjectIsTopLevel.cmake