Fixed CMake Policy CMP0026

icculus · Jan 18, 2015 · 1cf6691 · 1cf6691
1 parent 6ef1415
commit 1cf6691
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -812,13 +812,11 @@ OPTION(MOJOSETUP_BUILD_LUAC "Build separate Lua compiler" TRUE)
 IF(MOJOSETUP_BUILD_LUAC)
     ADD_EXECUTABLE(mojoluac ${MOJOLUAC_SRCS})
     TARGET_LINK_LIBRARIES(mojoluac ${OPTIONAL_LIBS})
-    GET_TARGET_PROPERTY(MOJOLUAC_LOCATION mojoluac LOCATION)
     # !!! FIXME: actually compile this.
-    ADD_CUSTOM_TARGET(lua "${MOJOLUAC_LOCATION}" -p ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.lua)
+    ADD_CUSTOM_TARGET(lua mojoluac -p ${CMAKE_CURRENT_SOURCE_DIR}/scripts/*.lua)
 ENDIF(MOJOSETUP_BUILD_LUAC)
 
 ADD_EXECUTABLE(mojosetup ${USES_WINMAIN} ${MOJOSETUP_SRCS} ${OPTIONAL_SRCS})
-GET_TARGET_PROPERTY(MOJOSETUP_BINARY_LOCATION mojosetup LOCATION)
 TARGET_LINK_LIBRARIES(mojosetup ${OPTIONAL_LIBS})
 SET(MOJOSETUP_TARGETS "${MOJOSETUP_TARGETS};mojosetup")
 
@@ -836,7 +834,7 @@ ADD_CUSTOM_TARGET(skeleton
     COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/skeleton/data
     COMMAND ${CMAKE_COMMAND} -DFROM=${CMAKE_SOURCE_DIR}/scripts/*.lua -DTO=${CMAKE_BINARY_DIR}/skeleton/scripts -P ${CMAKE_SOURCE_DIR}/misc/cp.cmake
     COMMAND ${CMAKE_COMMAND} -DFROM=${CMAKE_BINARY_DIR}/*mojosetupgui*.* -DTO=${CMAKE_BINARY_DIR}/skeleton/guis -P ${CMAKE_SOURCE_DIR}/misc/cp.cmake
-    COMMAND ${CMAKE_COMMAND} -E copy ${MOJOSETUP_BINARY_LOCATION} ${CMAKE_BINARY_DIR}/skeleton
+    COMMAND ${CMAKE_COMMAND} -E copy mojosetup ${CMAKE_BINARY_DIR}/skeleton
 )
 
 ADD_DEPENDENCIES(skeleton ${MOJOSETUP_TARGETS})