diff options
| author | madmaxoft <github@xoft.cz> | 2014-07-19 13:22:16 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-07-19 13:22:16 +0200 |
| commit | 9e7958e7fbb5a2477e04d30724730e15335b969f (patch) | |
| tree | b89a41088d5cafe4242c7c094f33e671d16a4563 | |
| parent | Moved Windows custom command to src/CMakeLists.txt (diff) | |
| download | cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.tar cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.tar.gz cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.tar.bz2 cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.tar.lz cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.tar.xz cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.tar.zst cuberite-9e7958e7fbb5a2477e04d30724730e15335b969f.zip | |
| -rw-r--r-- | src/Bindings/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Bindings/CMakeLists.txt b/src/Bindings/CMakeLists.txt index 4726eea23..95b858f5d 100644 --- a/src/Bindings/CMakeLists.txt +++ b/src/Bindings/CMakeLists.txt @@ -112,7 +112,7 @@ set(BINDING_DEPENDECIES ../World.h ) -if (NOT WIN32) +if (NOT MSVC) ADD_CUSTOM_COMMAND( # add any new generated bindings here OUTPUT ${BINDING_OUTPUTS} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 168c576e2..9feaf64fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -230,7 +230,7 @@ endif() set(EXECUTABLE MCServer) -if (WIN32) +if (MSVC) get_directory_property(BINDING_OUTPUTS DIRECTORY "Bindings" DEFINITION BINDING_OUTPUTS) get_directory_property(BINDING_DEPENDENCIES DIRECTORY "Bindings" DEFINITION BINDING_DEPENDENCIES) @@ -241,8 +241,8 @@ if (WIN32) COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/MCServer/lua51.dll ./lua51.dll # Regenerate bindings: - COMMAND tolua -L Bindings/virtual_method_hooks.lua -o Bindings/Bindings.cpp -H Bindings/Bindings.h Bindings/AllToLua.pkg - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND tolua -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Bindings/ # add any new generation dependencies here DEPENDS ${BINDING_DEPENDECIES} |