# HG changeset patch # User koda # Date 1377299638 -7200 # Node ID 37fcb9a796e601c6bac9151bbfe11a676efc69a4 # Parent d95ac99925296abf565efda20ae7943494b05519 this should prevent duplication of CMAKE_Pascal_FLAGS diff -r d95ac9992529 -r 37fcb9a796e6 cmake_modules/CMakeDeterminePascalCompiler.cmake --- a/cmake_modules/CMakeDeterminePascalCompiler.cmake Sat Aug 24 01:37:20 2013 +0400 +++ b/cmake_modules/CMakeDeterminePascalCompiler.cmake Sat Aug 24 01:13:58 2013 +0200 @@ -45,6 +45,7 @@ OUTPUT_VARIABLE CMAKE_Pascal_COMPILER_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) # we assume no error for something so simple + set(CMAKE_Pascal_COMPILER_ARG1 "-l- -v0ewn") endif(NOT CMAKE_Pascal_COMPILER_VERSION) mark_as_advanced(CMAKE_Pascal_COMPILER_VERSION) diff -r d95ac9992529 -r 37fcb9a796e6 cmake_modules/CMakePascalInformation.cmake --- a/cmake_modules/CMakePascalInformation.cmake Sat Aug 24 01:37:20 2013 +0400 +++ b/cmake_modules/CMakePascalInformation.cmake Sat Aug 24 01:13:58 2013 +0200 @@ -8,7 +8,6 @@ include(Platform/${CMAKE_SYSTEM_NAME}-${CMAKE_BASE_NAME} OPTIONAL) # This section should actually be in Platform/${CMAKE_SYSTME_NAME}-fpc.cmake -set(CMAKE_Pascal_FLAGS_INIT "-l- -v0ewn") set(CMAKE_Pascal_FLAGS_DEBUG_INIT "-g -gl -gp -gh") set(CMAKE_Pascal_FLAGS_MINSIZEREL_INIT "-Os -dNDEBUG") set(CMAKE_Pascal_FLAGS_RELEASE_INIT "-O3 -dNDEBUG") @@ -103,7 +102,7 @@ set(CMAKE_VERBOSE_MAKEFILE FALSE CACHE BOOL "If this value is on, makefiles will be generated without the .SILENT directive, and all commands will be echoed to the console during the make. This is useful for debugging only. With Visual Studio IDE projects all commands are done without /nologo.") -set(CMAKE_Pascal_FLAGS "$ENV{FPFLAGS} ${CMAKE_Pascal_FLAGS_INIT} ${CMAKE_Pascal_FLAGS}" CACHE STRING "Flags for Pascal compiler." FORCE) +#set(CMAKE_Pascal_FLAGS "$ENV{FPFLAGS} ${CMAKE_Pascal_FLAGS_INIT} ${CMAKE_Pascal_FLAGS}" CACHE STRING "Flags for Pascal compiler." FORCE) include(CMakeCommonLanguageInclude)