Imported Upstream version 2.8.10.2upstream/2.8.10.2

5 files changed, 31 insertions, 31 deletions

diff --git a/Tests/Jump/CMakeLists.txt b/Tests/Jump/CMakeLists.txt
index 4bdafd09b..4c5ad303f 100644
--- a/Tests/Jump/CMakeLists.txt
+++ b/Tests/Jump/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 2.6)
-PROJECT(Jump)
+project(Jump)
 
-SET(CMAKE_IGNORE_DEPENDENCIES_ORDERING 1)
-ADD_SUBDIRECTORY(Executable)
-ADD_SUBDIRECTORY(Library)
+set(CMAKE_IGNORE_DEPENDENCIES_ORDERING 1)
+add_subdirectory(Executable)
+add_subdirectory(Library)
diff --git a/Tests/Jump/Executable/CMakeLists.txt b/Tests/Jump/Executable/CMakeLists.txt
index 7658b7e31..bc6731ff1 100644
--- a/Tests/Jump/Executable/CMakeLists.txt
+++ b/Tests/Jump/Executable/CMakeLists.txt
@@ -1,6 +1,6 @@
-IF(NOT LIBRARY_OUTPUT_PATH)
-  LINK_DIRECTORIES(${Jump_BINARY_DIR}/Library/Static
+if(NOT LIBRARY_OUTPUT_PATH)
+  link_directories(${Jump_BINARY_DIR}/Library/Static
                    ${Jump_BINARY_DIR}/Library/Shared)
-ENDIF(NOT LIBRARY_OUTPUT_PATH)
-ADD_EXECUTABLE(jumpExecutable jumpExecutable.cxx)
-TARGET_LINK_LIBRARIES(jumpExecutable jumpStatic jumpShared)
+endif()
+add_executable(jumpExecutable jumpExecutable.cxx)
+target_link_libraries(jumpExecutable jumpStatic jumpShared)
diff --git a/Tests/Jump/Library/CMakeLists.txt b/Tests/Jump/Library/CMakeLists.txt
index 2f78c501c..1d9fed934 100644
--- a/Tests/Jump/Library/CMakeLists.txt
+++ b/Tests/Jump/Library/CMakeLists.txt
@@ -1,2 +1,2 @@
-ADD_SUBDIRECTORY(Static)
-ADD_SUBDIRECTORY(Shared)
+add_subdirectory(Static)
+add_subdirectory(Shared)
diff --git a/Tests/Jump/Library/Shared/CMakeLists.txt b/Tests/Jump/Library/Shared/CMakeLists.txt
index 44405770f..a37299a79 100644
--- a/Tests/Jump/Library/Shared/CMakeLists.txt
+++ b/Tests/Jump/Library/Shared/CMakeLists.txt
@@ -1,26 +1,26 @@
-ADD_LIBRARY(jumpShared SHARED jumpShared.cxx)
+add_library(jumpShared SHARED jumpShared.cxx)
 
-IF(WIN32 OR CYGWIN)
-  SET(SHARED_MUST_BE_IN_EXE_DIR 1)
-ENDIF()
+if(WIN32 OR CYGWIN)
+  set(SHARED_MUST_BE_IN_EXE_DIR 1)
+endif()
 
-IF(APPLE)
-  SET(SHARED_MUST_BE_IN_EXE_DIR 1)
-ENDIF(APPLE)
+if(APPLE)
+  set(SHARED_MUST_BE_IN_EXE_DIR 1)
+endif()
 
-IF(SHARED_MUST_BE_IN_EXE_DIR)
-  SET(LIB_NAME
+if(SHARED_MUST_BE_IN_EXE_DIR)
+  set(LIB_NAME
     ${CMAKE_SHARED_LIBRARY_PREFIX}jumpShared${CMAKE_SHARED_LIBRARY_SUFFIX})
-  SET(EXE_DIR ${Jump_BINARY_DIR}/Executable)
-  IF(EXECUTABLE_OUTPUT_PATH)
-    SET(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
-  ENDIF(EXECUTABLE_OUTPUT_PATH)
-  SET(LIB_DIR ${Jump_BINARY_DIR}/Library/Shared)
-  IF(LIBRARY_OUTPUT_PATH)
-    SET(LIB_DIR ${LIBRARY_OUTPUT_PATH})
-  ENDIF(LIBRARY_OUTPUT_PATH)
-  ADD_CUSTOM_COMMAND(TARGET jumpShared
+  set(EXE_DIR ${Jump_BINARY_DIR}/Executable)
+  if(EXECUTABLE_OUTPUT_PATH)
+    set(EXE_DIR ${EXECUTABLE_OUTPUT_PATH})
+  endif()
+  set(LIB_DIR ${Jump_BINARY_DIR}/Library/Shared)
+  if(LIBRARY_OUTPUT_PATH)
+    set(LIB_DIR ${LIBRARY_OUTPUT_PATH})
+  endif()
+  add_custom_command(TARGET jumpShared
     POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy
     ${LIB_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME}
     ${EXE_DIR}/${CMAKE_CFG_INTDIR}/${LIB_NAME})
-ENDIF(SHARED_MUST_BE_IN_EXE_DIR)
+endif()
diff --git a/Tests/Jump/Library/Static/CMakeLists.txt b/Tests/Jump/Library/Static/CMakeLists.txt
index 23e70c0b1..4ee39545a 100644
--- a/Tests/Jump/Library/Static/CMakeLists.txt
+++ b/Tests/Jump/Library/Static/CMakeLists.txt
@@ -1 +1 @@
-ADD_LIBRARY(jumpStatic STATIC jumpStatic.cxx)
+add_library(jumpStatic STATIC jumpStatic.cxx)