From 81cc84c1727c1b1c1782e63aba22202cba649af7 Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Wed, 21 Aug 2019 11:31:09 +0200 Subject: [PATCH 1/2] Fix core #1948 - editline does not build --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bad24074e..292b57402 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,7 +250,7 @@ install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include ) # begin editline stuff if(WIN32) target_compile_definitions( fc PRIVATE _CRT_NONSTDC_NO_DEPRECATE ) -elseif(WIN32) +else(WIN32) target_compile_definitions (fc PRIVATE HAVE_EDITLINE) set(editline_libraries editline) endif(WIN32) From ea85954e1735c2cdc7287dbe13568a4290789f6e Mon Sep 17 00:00:00 2001 From: Peter Conrad Date: Wed, 21 Aug 2019 11:31:41 +0200 Subject: [PATCH 2/2] Adjust whitespace --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 292b57402..02dab6123 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,8 +251,8 @@ install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include ) if(WIN32) target_compile_definitions( fc PRIVATE _CRT_NONSTDC_NO_DEPRECATE ) else(WIN32) - target_compile_definitions (fc PRIVATE HAVE_EDITLINE) - set(editline_libraries editline) + target_compile_definitions( fc PRIVATE HAVE_EDITLINE ) + set( editline_libraries editline ) endif(WIN32) # end editline stuff