# HG changeset patch # User koda # Date 1363945423 -3600 # Node ID edceeafff671deb40c0b638058cbf3b72fe27c6f # Parent 06562cd688974456a59ff382471c565746b5e01e no need of ar and ranlib for pascal diff -r 06562cd68897 -r edceeafff671 cmake_modules/CMakeDeterminePascalCompiler.cmake --- a/cmake_modules/CMakeDeterminePascalCompiler.cmake Fri Mar 22 10:40:48 2013 +0100 +++ b/cmake_modules/CMakeDeterminePascalCompiler.cmake Fri Mar 22 10:43:43 2013 +0100 @@ -43,15 +43,6 @@ GET_FILENAME_COMPONENT(COMPILER_LOCATION "${CMAKE_Pascal_COMPILER}" PATH) -#FIND_PROGRAM(GNAT_EXECUTABLE_BUILDER NAMES gnatmake PATHS ${COMPILER_LOCATION} ) -FIND_PROGRAM(CMAKE_AR NAMES ar PATHS ${COMPILER_LOCATION} ) - -FIND_PROGRAM(CMAKE_RANLIB NAMES ranlib) -IF(NOT CMAKE_RANLIB) - SET(CMAKE_RANLIB : CACHE INTERNAL "noop for ranlib") -ENDIF(NOT CMAKE_RANLIB) -MARK_AS_ADVANCED(CMAKE_RANLIB) - # configure variables set in this file for fast reload later on if(${CMAKE_VERSION} VERSION_LESS 2.8.10) CONFIGURE_FILE(${CMAKE_MODULE_PATH}/CMakePascalCompiler.cmake.in @@ -63,6 +54,4 @@ IMMEDIATE ) endif(${CMAKE_VERSION} VERSION_LESS 2.8.10) -MARK_AS_ADVANCED(CMAKE_AR) - SET(CMAKE_Pascal_COMPILER_ENV_VAR "FPC") diff -r 06562cd68897 -r edceeafff671 cmake_modules/CMakePascalCompiler.cmake.in --- a/cmake_modules/CMakePascalCompiler.cmake.in Fri Mar 22 10:40:48 2013 +0100 +++ b/cmake_modules/CMakePascalCompiler.cmake.in Fri Mar 22 10:43:43 2013 +0100 @@ -1,7 +1,5 @@ SET(CMAKE_Pascal_COMPILER "@CMAKE_Pascal_COMPILER@") SET(CMAKE_Pascal_COMPILER_ARG1 "@CMAKE_Pascal_COMPILER_ARG1@") -SET(CMAKE_AR "@CMAKE_AR@") -SET(CMAKE_RANLIB "@CMAKE_RANLIB@") SET(CMAKE_Pascal_COMPILER_LOADED 1) SET(CMAKE_Pascal_COMPILER_ENV_VAR "FPC") diff -r 06562cd68897 -r edceeafff671 cmake_modules/CMakePascalInformation.cmake --- a/cmake_modules/CMakePascalInformation.cmake Fri Mar 22 10:40:48 2013 +0100 +++ b/cmake_modules/CMakePascalInformation.cmake Fri Mar 22 10:43:43 2013 +0100 @@ -129,8 +129,7 @@ # # Static library tools -# -# +# NONE! if(NOT EXECUTABLE_OUTPUT_PATH) set (EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})