More fixes related to install step

farm-ng · Dec 26, 2023 · 73b1578 · 73b1578
1 parent 4a07461
commit 73b1578
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 26 deletions.
diff --git a/cmake/farm_ng_add_library.cmake b/cmake/farm_ng_add_library.cmake
@@ -47,21 +47,21 @@ macro(farm_ng_add_library target)
       "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/${abs_include}>"
       "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>")
 
-  if(DEFINED FARM_NG_ARGS_SOURCES)
-    foreach ( file ${FARM_NG_ARGS_HEADERS} )
+  foreach ( file ${FARM_NG_ARGS_HEADERS} )
+    if(IS_ABSOLUTE ${file})
+      file(RELATIVE_PATH rel ${CMAKE_SOURCE_DIR}/${abs_include} ${file})
+    else()
+      file(RELATIVE_PATH rel ${CMAKE_SOURCE_DIR}/${abs_include} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+    endif()
 
-      if(IS_ABSOLUTE ${file})
-        file(RELATIVE_PATH rel ${CMAKE_SOURCE_DIR}/${abs_include} ${file})
-      else()
-        file(RELATIVE_PATH rel ${CMAKE_SOURCE_DIR}/${abs_include} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-      endif()
+    get_filename_component( dir ${rel} DIRECTORY )
+    install( FILES ${file}
+        DESTINATION include/${dir}
+        COMPONENT Devel)
+  endforeach()
 
-      get_filename_component( dir ${rel} DIRECTORY )
-      install( FILES ${file}
-          DESTINATION include/${dir}
-          COMPONENT Devel)
-    endforeach()
 
+  if(DEFINED FARM_NG_ARGS_SOURCES)
     string(REPLACE "." ";" VERSION_LIST ${PROJECT_VERSION})
     list(GET VERSION_LIST 0 VERSION_MAJOR)
     list(GET VERSION_LIST 1 VERSION_MINOR)

diff --git a/cpp/farm_ng/core/plotting/CMakeLists.txt b/cpp/farm_ng/core/plotting/CMakeLists.txt
@@ -21,7 +21,7 @@ endforeach()
 
 farm_ng_add_library(farm_ng_core_plotting
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../..
+  INCLUDE_DIR ../../..
   HEADERS
     ${farm_ng_component_headers}
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/calculus/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/calculus/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_calculus
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/color/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/color/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_color
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/geometry/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/geometry/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_geometry
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/image/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/image/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_image
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/lie/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/lie/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_lie
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/linalg/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/linalg/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_linalg
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/plotting/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/plotting/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_plotting
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/sensor/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/sensor/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_sensor
 NAMESPACE farm_ng_core
-INCLUDE_DIR ../../..
+INCLUDE_DIR ../../../..
 HEADERS
   conv.h
 SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/std/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/std/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_std
   NAMESPACE farm_ng_core
-  INCLUDE_DIR ../../..
+  INCLUDE_DIR ../../../..
   HEADERS
     conv.h
   SOURCES

diff --git a/cpp/farm_ng/core/proto_conv/struct/CMakeLists.txt b/cpp/farm_ng/core/proto_conv/struct/CMakeLists.txt
@@ -1,6 +1,6 @@
 farm_ng_add_library(farm_ng_core_proto_conv_struct
 NAMESPACE farm_ng_core
-INCLUDE_DIR ../../..
+INCLUDE_DIR ../../../..
 HEADERS
   conv_impl_macro.ipp
 SOURCES

diff --git a/cpp/farm_ng/core/struct/CMakeLists.txt b/cpp/farm_ng/core/struct/CMakeLists.txt
@@ -24,9 +24,9 @@ farm_ng_add_library(farm_ng_core_struct
   NAMESPACE farm_ng_core
   INCLUDE_DIR ../../..
   HEADERS
-   base
-   macro_lib
-   struct
+   base.h
+   macro_lib.h
+   struct.h
 )
 
 target_link_libraries(farm_ng_core_struct