Преглед изворни кода

build system: updated installation process (close #451)

Michele Caini пре 6 година
родитељ
комит
dfc18619a2
2 измењених фајлова са 8 додато и 2 уклоњено
  1. 8 1
      CMakeLists.txt
  2. 0 1
      cmake/in/EnTTConfig.cmake.in

+ 8 - 1
CMakeLists.txt

@@ -118,7 +118,12 @@ configure_package_config_file(
     ${EnTT_SOURCE_DIR}/cmake/in/EnTTConfig.cmake.in
     EnTTConfig.cmake
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/EnTT/cmake
-    PATH_VARS CMAKE_INSTALL_INCLUDEDIR
+)
+
+export(
+    EXPORT EnTTTargets
+    FILE ${CMAKE_CURRENT_BINARY_DIR}/EnTTTargets.cmake
+    NAMESPACE EnTT::
 )
 
 install(
@@ -137,6 +142,8 @@ install(
 
 install(DIRECTORY src/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
+export(PACKAGE EnTT)
+
 #
 # Tests
 #

+ 0 - 1
cmake/in/EnTTConfig.cmake.in

@@ -1,6 +1,5 @@
 @PACKAGE_INIT@
 
 set(EnTT_VERSION "@PROJECT_VERSION@")
-set_and_check(EnTT_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
 include("${CMAKE_CURRENT_LIST_DIR}/EnTTTargets.cmake")
 check_required_components("@PROJECT_NAME@")