Merge pull request #1214 from mc-server/anti-glob

CMake - Explicitly lists all source files

src/Generating/CMakeLists.txt

@@ -4,11 +4,62 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	BioGen.cpp
+	Caves.cpp
+	ChunkDesc.cpp
+	ChunkGenerator.cpp
+	CompoGen.cpp
+	ComposableGenerator.cpp
+	DistortedHeightmap.cpp
+	EndGen.cpp
+	FinishGen.cpp
+	GridStructGen.cpp
+	HeiGen.cpp
+	MineShafts.cpp
+	NetherFortGen.cpp
+	Noise3DGenerator.cpp
+	POCPieceGenerator.cpp
+	PieceGenerator.cpp
+	Prefab.cpp
+	PrefabPiecePool.cpp
+	RainbowRoadsGen.cpp
+	Ravines.cpp
+	StructGen.cpp
+	TestRailsGen.cpp
+	Trees.cpp
+	UnderwaterBaseGen.cpp
+	VillageGen.cpp)
 
-add_library(Generating ${SOURCE})
+SET (HDRS
+	BioGen.h
+	Caves.h
+	ChunkDesc.h
+	ChunkGenerator.h
+	CompoGen.h
+	ComposableGenerator.h
+	DistortedHeightmap.h
+	EndGen.h
+	FinishGen.h
+	GridStructGen.h
+	HeiGen.h
+	MineShafts.h
+	NetherFortGen.h
+	Noise3DGenerator.h
+	POCPieceGenerator.h
+	PieceGenerator.h
+	Prefab.h
+	PrefabPiecePool.h
+	RainbowRoadsGen.h
+	Ravines.h
+	StructGen.h
+	TestRailsGen.h
+	Trees.h
+	UnderwaterBaseGen.h
+	VillageGen.h)
 
-target_link_libraries(Generating OSSupport iniFile Blocks)
+if(NOT MSVC)
+	add_library(Generating ${SRCS} ${HDRS})
+
+	target_link_libraries(Generating OSSupport iniFile Blocks)
+endif()

src/Generating/Prefabs/CMakeLists.txt

@@ -4,11 +4,30 @@ project (MCServer)
 
 include_directories ("${PROJECT_SOURCE_DIR}/../../")
 
-file(GLOB SOURCE
-    "*.cpp"
-    "*.h"
-)
+SET (SRCS
+	AlchemistVillagePrefabs.cpp
+	JapaneseVillagePrefabs.cpp
+	NetherFortPrefabs.cpp
+	PlainsVillagePrefabs.cpp
+	RainbowRoadPrefabs.cpp
+	SandFlatRoofVillagePrefabs.cpp
+	SandVillagePrefabs.cpp
+	TestRailsPrefabs.cpp
+	UnderwaterBasePrefabs.cpp)
 
-add_library(Generating_Prefabs ${SOURCE})
+SET (HDRS
+	AlchemistVillagePrefabs.h
+	JapaneseVillagePrefabs.h
+	NetherFortPrefabs.h
+	PlainsVillagePrefabs.h
+	RainbowRoadPrefabs.h
+	SandFlatRoofVillagePrefabs.h
+	SandVillagePrefabs.h
+	TestRailsPrefabs.h
+	UnderwaterBasePrefabs.h)
 
-target_link_libraries(Generating_Prefabs OSSupport iniFile Blocks)
+if(NOT MSVC)
+	add_library(Generating_Prefabs ${SRCS} ${HDRS})
+
+	target_link_libraries(Generating_Prefabs OSSupport iniFile Blocks)
+endif()