summaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-19 18:21:29 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-19 18:21:29 +0100
commitcb9f30d4eed9a9ad8564104c751884eea1ee787d (patch)
tree6d81ca602f6d0df518a5bdfe590e932fc640561c /src/CMakeLists.txt
parentmodified travis CI file for cmake (diff)
parentfixed include paths on windows and added build dir to gitignore (diff)
downloadcuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar
cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.gz
cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.bz2
cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.lz
cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.xz
cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.tar.zst
cuberite-cb9f30d4eed9a9ad8564104c751884eea1ee787d.zip
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt22
1 files changed, 16 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e247df34e..a557b7dac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,8 @@ function(includefolder PATH)
"${PATH}/*.cpp"
"${PATH}/*.h"
)
- source_group("Source Files\\${PATH}" FILES ${FOLDER_FILES})
+ source_group("${PATH}" FILES ${FOLDER_FILES})
+
endfunction(includefolder)
foreach(folder ${FOLDERS})
@@ -40,14 +41,23 @@ file(GLOB_RECURSE SOURCE
"*.h"
)
+include_directories("${PROJECT_SOURCE_DIR}")
+
+source_group("" FILES ${SOURCE})
endif()
list(REMOVE_ITEM SOURCE "${PROJECT_SOURCE_DIR}/StackWalker.cpp" "${PROJECT_SOURCE_DIR}/LeakFinder.cpp")
-add_executable(../MCServer/MCServer ${SOURCE})
+if(UNIX)
+ set(EXECUTABLE ../MCServer/MCServer)
+else()
+ set(EXECUTABLE MCServer)
+endif()
+
+add_executable(${EXECUTABLE} ${SOURCE})
-target_link_libraries(../MCServer/MCServer OSSupport HTTPServer iniFile Bindings Items Blocks)
-target_link_libraries(../MCServer/MCServer Protocol Generating WorldStorage jsoncpp cryptopp)
-target_link_libraries(../MCServer/MCServer Mobs Entities Simulator UI zlib lua BlockEntities)
-target_link_libraries(../MCServer/MCServer md5 luaexpat)
+target_link_libraries(${EXECUTABLE} OSSupport HTTPServer iniFile Bindings Items Blocks)
+target_link_libraries(${EXECUTABLE} Protocol Generating WorldStorage jsoncpp cryptopp)
+target_link_libraries(${EXECUTABLE} Mobs Entities Simulator UI zlib lua BlockEntities)
+target_link_libraries(${EXECUTABLE} md5 luaexpat)