From d59d4312aa4d271c2afd4bacfdb8e896fa2d8d83 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Tue, 7 May 2024 09:28:38 -0400 Subject: [PATCH] APREPRO: Do not add #lines on generated bison --- cmake/FortranSettings.cmake | 18 ------------------ .../libraries/aprepro_lib/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 cmake/FortranSettings.cmake diff --git a/cmake/FortranSettings.cmake b/cmake/FortranSettings.cmake deleted file mode 100644 index 2d87f84142..0000000000 --- a/cmake/FortranSettings.cmake +++ /dev/null @@ -1,18 +0,0 @@ -ADD_DEFINITIONS(-DBuild64) - -IF ("${FC_FN_UNDERSCORE}" STREQUAL "UNDER") - ADD_DEFINITIONS(-DADDC_) -ENDIF() - -IF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fcray-pointer -fdefault-real-8 -fdefault-integer-8 -fno-range-check") -ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "LLVMFlang") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-integer-8") -ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "XL") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qintsize=8 -qrealsize=8") -ELSEIF ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "Cray") - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -sdefault64") -ELSE() - SET(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -i8") -ENDIF() - diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt index 51fb1fc194..13fcf791dd 100644 --- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt +++ b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt @@ -78,7 +78,7 @@ if(GENERATE_BISON_FILES) add_custom_command(OUTPUT apr_parser.cc COMMAND ${BISON_EXE} - ARGS --defines=aprepro_parser.h --output apr_parser.cc + ARGS --no-lines --defines=aprepro_parser.h --output apr_parser.cc ${CMAKE_CURRENT_SOURCE_DIR}/aprepro.yy MAIN_DEPENDENCY aprepro.yy WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}