Merge branch 'postmodern-cmake/thirdparty_cleanup' into postmodern-cm…

…ake/game-targets
ludumipsum · Apr 25, 2018 · 601db76 · 601db76
2 parents 6b8b5a2 + fa52a51
commit 601db76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/code/nonstd/core/targets.cmake b/code/nonstd/core/targets.cmake
@@ -21,30 +21,30 @@ tfe_autotarget(
     TEST NAME enumerate
     SOURCES enumerate.test.cc
     DEPENDS
-        nonstd::nonstd
+        nonstd::core::core
         testrunner::testrunner
 )
 
 tfe_autotarget(
     TEST NAME primitive_types
     SOURCES primitive_types.test.cc
     DEPENDS
-        nonstd::nonstd
+        nonstd::core::core
         testrunner::testrunner
 )
 
 tfe_autotarget(
     TEST NAME range
     SOURCES range.test.cc
     DEPENDS
-        nonstd::nonstd
+        nonstd::core::core
         testrunner::testrunner
 )
 
 tfe_autotarget(
     TEST NAME type_traits_ext
     SOURCES type_traits_ext.test.cc
     DEPENDS
-        nonstd::nonstd
+        nonstd::core::core
         testrunner::testrunner
 )
diff --git a/code/nonstd/targets.cmake b/code/nonstd/targets.cmake
@@ -72,9 +72,8 @@ tfe_autotarget(
         nonstd::memory
         nonstd::utility_ext
         nonstd::windows
-
-        # TODO: Fix thirdparty deps
-        Boost::boost fmt::fmt
+        thirdparty::boost::preprocessor
+        thirdparty::fmt
 )
 
 tfe_autotarget(