From 9e8598fb1ca359143600d6bb2e8b317126a86bcc Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@outlook.com>
Date: Sat, 16 May 2020 20:59:10 +0100
Subject: Upgrade to C++17 [CMake] (#4717)

* Make our CMake slightly less insane
---
 src/Simulator/CMakeLists.txt                              | 10 ++--------
 src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt | 11 ++---------
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'src/Simulator')

diff --git a/src/Simulator/CMakeLists.txt b/src/Simulator/CMakeLists.txt
index a8efc988c..2acaa2031 100644
--- a/src/Simulator/CMakeLists.txt
+++ b/src/Simulator/CMakeLists.txt
@@ -1,5 +1,6 @@
+target_sources(
+	${CMAKE_PROJECT_NAME} PRIVATE
 
-SET (SRCS
 	DelayedFluidSimulator.cpp
 	FireSimulator.cpp
 	FloodyFluidSimulator.cpp
@@ -9,9 +10,7 @@ SET (SRCS
 	SimulatorManager.cpp
 	VanillaFluidSimulator.cpp
 	VaporizeFluidSimulator.cpp
-)
 
-SET (HDRS
 	DelayedFluidSimulator.h
 	FireSimulator.h
 	FloodyFluidSimulator.h
@@ -25,8 +24,3 @@ SET (HDRS
 	VanillaFluidSimulator.h
 	VaporizeFluidSimulator.h
 )
-
-if(NOT MSVC)
-	add_library(Simulator ${SRCS} ${HDRS})
-	target_link_libraries(Simulator fmt::fmt SQLiteCpp)
-endif()
diff --git a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
index 0c2346322..1857a115a 100644
--- a/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
+++ b/src/Simulator/IncrementalRedstoneSimulator/CMakeLists.txt
@@ -1,9 +1,8 @@
+target_sources(
+	${CMAKE_PROJECT_NAME} PRIVATE
 
-set (SRCS
 	IncrementalRedstoneSimulator.cpp
-)
 
-set (HDRS
 	CommandBlockHandler.h
 	DoorHandler.h
 	DropSpenserHandler.h
@@ -29,9 +28,3 @@ set (HDRS
 	PoweredRailHandler.h
 	PressurePlateHandler.h
 )
-
-if(NOT MSVC)
-	add_library(IncrementalRedstoneSimulator ${SRCS} ${HDRS})
-	target_link_libraries(IncrementalRedstoneSimulator fmt::fmt)
-endif()
-
-- 
cgit v1.2.3