Forráskód Böngészése

Delete CMakeLists from compilers subfolder

Daniele Bartolini 12 éve
szülő
commit
7da26e37a3
2 módosított fájl, 48 hozzáadás és 46 törlés
  1. 48 5
      tools/CMakeLists.txt
  2. 0 41
      tools/compilers/CMakeLists.txt

+ 48 - 5
tools/CMakeLists.txt

@@ -6,12 +6,55 @@ set (INCLUDES
 	compilers
 )
 
-link_directories(${CROWN_BINARY_DIR} ${GTKMM_LIBRARY_DIRS})
-include_directories(${INCLUDES} ${GTKMM_INCLUDE_DIRS})
+set (COMPILERS_SRC
+	compilers/Compiler.cpp
+	compilers/tga/TGACompiler.cpp
+	compilers/txt/TXTCompiler.cpp
+	compilers/ps/PSCompiler.cpp
+	compilers/vs/VSCompiler.cpp
+)
+
+set (COMPILER_HEADERS
+	compilers/Compiler.h
+	compilers/tga/TGACompiler.h
+	compilers/txt/TXTCompiler.h
+	compilers/ps/PSCompiler.h
+	compilers/vs/VSCompiler.h
+)
+
+set (TOOLS_SRC
+	${COMPILERS_SRC}
+)
+
+set (TOOLS_HEADERS
+	${COMPILERS_HEADERS}
+)
+
+include_directories(${INCLUDES})
+
+# tools library
+add_library(crown-tools ${TOOLS_SRC} ${TOOLS_HEADERS})
+
+# resource-linker
+add_executable(resource-linker cli/resource-linker.cpp)
+target_link_libraries(resource-linker crown-tools)
+
+# resource-hash
+add_executable(resource-hash cli/resource-hash.cpp)
+target_link_libraries(resource-hash crown-tools)
+
+# resource-compiler
+add_executable(resource-compiler cli/resource-compiler.cpp)
+target_link_libraries(resource-compiler crown-tools)
+
+install (TARGETS crown-tools DESTINATION lib/${CMAKE_PROJECT_NAME})
+
+install (TARGETS resource-linker DESTINATION bin)
+install (TARGETS resource-hash DESTINATION bin)
+install (TARGETS resource-compiler DESTINATION bin)
+install (FILES cli/resource-compiler.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
 
-add_subdirectory(compilers)
-#add_subdirectory(editors/world-editor)
 add_subdirectory(editors/resource-browser)
 add_subdirectory(editors/toolchain)
 add_subdirectory(pycrown)
-

+ 0 - 41
tools/compilers/CMakeLists.txt

@@ -1,41 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-set (SRC
-	Compiler.cpp
-	tga/TGACompiler.cpp
-	txt/TXTCompiler.cpp
-	ps/PSCompiler.cpp
-	vs/VSCompiler.cpp
-)
-
-set (HEADERS
-	Compiler.h
-	tga/TGACompiler.h
-	txt/TXTCompiler.h
-	ps/PSCompiler.h
-	vs/VSCompiler.h
-)
-
-# utils
-add_library(crown-compiler-utils ${SRC} ${HEADERS})
-target_link_libraries(crown-compiler-utils)
-
-# resource-linker
-add_executable(resource-linker resource-linker.cpp)
-target_link_libraries(resource-linker)
-
-# resource-hash
-add_executable(resource-hash resource-hash.cpp)
-target_link_libraries(resource-hash)
-
-# resource-compiler
-add_executable(resource-compiler resource-compiler.cpp)
-target_link_libraries(resource-compiler crown-compiler-utils)
-
-install (TARGETS crown-compiler-utils DESTINATION lib/${CMAKE_PROJECT_NAME})
-
-install (TARGETS resource-linker DESTINATION bin)
-install (TARGETS resource-hash DESTINATION bin)
-install (TARGETS resource-compiler DESTINATION bin)
-install (FILES resource-compiler.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
-	GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)