Merge pull request #198 from Lasall/cmake-export-fix

Fix cmake package export.
mlpack · May 6, 2020 · 70a2be8 · 70a2be8
2 parents 82817a6 + 1aa9e2e
commit 70a2be8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CMake/ensmallen-config.cmake.in b/CMake/ensmallen-config.cmake.in
@@ -1,4 +1,4 @@
 @PACKAGE_INIT@
 
-include(${CMAKE_CURRENT_LIST_DIR}/@targets_export_name@.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake)
 check_required_components(ensmallen)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,9 +38,9 @@ target_include_directories(ensmallen INTERFACE
 
 # Set warning flags for target.
 if(MSVC)
-  target_compile_options(ensmallen INTERFACE /Wall )
+  target_compile_options(ensmallen INTERFACE $<BUILD_INTERFACE:/Wall>)
 else()
-  target_compile_options(ensmallen INTERFACE -Wall -Wpedantic -Wunused-parameter)
+  target_compile_options(ensmallen INTERFACE $<BUILD_INTERFACE:-Wall -Wpedantic -Wunused-parameter>)
 endif()
 
 # Find OpenMP and link it.

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,7 @@
 ### ensmallen ?.??.?: "???"
 ###### ????-??-??
+ * Fix CMake package export
+    ([#198](https://github.com/mlpack/ensmallen/pull/198)).
 
 ### ensmallen 2.12.1: "Stir Crazy"
 ###### 2020-04-20