summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-30 07:43:25 +0200
committerarchshift <admin@archshift.com>2014-07-30 07:43:25 +0200
commit1d684697186de4340c6a1cc5aea6a14ffd19c002 (patch)
tree596700a979836e504481d4e0a347e4bd5dd4c73c
parentMerge pull request #1262 from mc-server/CanBeTerraformed (diff)
downloadcuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.tar
cuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.tar.gz
cuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.tar.bz2
cuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.tar.lz
cuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.tar.xz
cuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.tar.zst
cuberite-1d684697186de4340c6a1cc5aea6a14ffd19c002.zip
-rw-r--r--.gitignore2
-rw-r--r--src/Bindings/CMakeLists.txt4
-rw-r--r--src/CMakeLists.txt8
3 files changed, 7 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore
index 51987336c..a4cbef72f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,7 +64,7 @@ install_mainfest.txt
src/MCServer
lib/tolua++/tolua
src/Bindings/Bindings.*
-src/Bindings/BindingDependecies.txt
+src/Bindings/BindingDependencies.txt
MCServer.dir/
src/AllFiles.lst
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt
index 2ea2fa8c0..48e7ce79c 100644
--- a/src/Bindings/CMakeLists.txt
+++ b/src/Bindings/CMakeLists.txt
@@ -125,8 +125,8 @@ if (NOT MSVC)
DEPENDS ${BINDING_DEPENDENCIES}
)
endif ()
-set_source_files_properties(Bindings/Bindings.cpp PROPERTIES GENERATED TRUE)
-set_source_files_properties(Bindings/Bindings.h PROPERTIES GENERATED TRUE)
+set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.cpp PROPERTIES GENERATED TRUE)
+set_source_files_properties(${CMAKE_SOURCE_DIR}/src/Bindings/Bindings.h PROPERTIES GENERATED TRUE)
if(NOT MSVC)
add_library(Bindings ${SRCS} ${HDRS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29337cb2e..87599c60d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -151,10 +151,10 @@ if (NOT MSVC)
get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES)
#clear file
- file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt)
- foreach(dependecy ${BINDING_DEPENDECIES})
- #write each dependecy on a seperate line
- file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependecies.txt "${dependecy}\n")
+ file(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependencies.txt)
+ foreach(dependency ${BINDING_DEPENDENCIES})
+ #write each dependency on a seperate line
+ file(APPEND ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/BindingDependencies.txt "${dependency}\n")
endforeach()
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "Bindings.cpp Bindings.h")