(#24893) magic_enum/0.9.6: fixes install dir

conan-io · Aug 11, 2024 · eed8c8f · eed8c8f
1 parent f3c3ac9
commit eed8c8f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/recipes/magic_enum/all/conanfile.py b/recipes/magic_enum/all/conanfile.py
@@ -60,7 +60,7 @@ def build(self):
         pass
 
     def package(self):
-        copy(self, "*", src=os.path.join(self.source_folder, "include"), dst=os.path.join(self.package_folder, "include"))
+        copy(self, "*", src=os.path.join(self.source_folder, "include/magic_enum"), dst=os.path.join(self.package_folder, "include"))
         copy(self, "LICENSE", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
 
     def package_info(self):

diff --git a/recipes/magic_enum/all/test_package/CMakeLists.txt b/recipes/magic_enum/all/test_package/CMakeLists.txt
@@ -6,7 +6,3 @@ find_package(magic_enum REQUIRED CONFIG)
 add_executable(${PROJECT_NAME} test_package.cpp)
 target_link_libraries(${PROJECT_NAME} PRIVATE magic_enum::magic_enum)
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17)
-
-if(magic_enum_VERSION VERSION_GREATER_EQUAL "0.9.4")
-    target_compile_definitions(${PROJECT_NAME} PRIVATE MAGIC_ENUM_INCLUDE_WITH_FOLDER)
-endif()
diff --git a/recipes/magic_enum/all/test_package/test_package.cpp b/recipes/magic_enum/all/test_package/test_package.cpp
@@ -1,8 +1,4 @@
-#ifdef MAGIC_ENUM_INCLUDE_WITH_FOLDER
-#  include <magic_enum/magic_enum.hpp>
-#else
-#  include <magic_enum.hpp>
-#endif
+#include <magic_enum.hpp>
 #include <cstdlib>
 #include <string>