clenaup, remove test game as CTest/libuv didn't always work

Author: scivision

CMakeLists.txt

@@ -7,29 +7,19 @@ VERSION 1.7.0
 
 enable_testing()
 
-set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/include)
 include_directories(${CMAKE_Fortran_MODULE_DIRECTORY})
 
-include(options.cmake)
+option(${PROJECT_NAME}_BUILD_TESTING "enable testing" ${PROJECT_IS_TOP_LEVEL})
+option(find "find Ncurses or if not, build PDcurses" true)
+option(CMAKE_TLS_VERIFY "enable TLS verification" true)
+
 include(cmake/compilers.cmake)
 
 include(cmake/curses.cmake)
 
 message(STATUS "${PROJECT_NAME} CMake ${CMAKE_VERSION} install prefix: ${CMAKE_INSTALL_PREFIX}")
 
-if(CMAKE_GENERATOR MATCHES "Ninja")
-  if(WIN32)
-    set(_rec "MinGW Makefiles")
-  else()
-    set(_rec "Unix Makefiles")
-  endif()
-  if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.27.0 AND CMAKE_VERSION VERSION_LESS 3.27.8)
-    message(WARNING "CMake ${CMAKE_VERSION} has a bug that prevents Ninja from working properly. Please use Makefile generator:
-    cmake -G \"${_rec}\"")
-  endif()
-endif()
-
 add_executable(blocktran app/main.f90 src/game.f90)
 target_link_libraries(blocktran PRIVATE AI cinter menu shapes blocks keys errs sleep random)
 target_compile_options(blocktran PRIVATE ${compile_opts})
@@ -43,15 +33,4 @@ endif()
 
 install(TARGETS blocktran EXPORT ${PROJECT_NAME}-targets)
 
-if(${PROJECT_NAME}_BUILD_TESTING)
-  add_test(NAME game COMMAND blocktran -d 100 -s 6 6)
-  set_tests_properties(game PROPERTIES
-  LABELS gui
-  DISABLED $<BOOL:${CI}>
-  TIMEOUT 30
-  RESOURCE_LOCK display
-  DEPENDS "shapes;motion;random"
-  )
-endif()
-
 include(cmake/install.cmake)

cmake/abi_check/abi_check.h

@@ -1,2 +1,2 @@
-extern int addone(int);
-extern int addtwo(int);
+int addone(int);
+int addtwo(int);

cmake/abi_check/addtwo.cpp

@@ -1,5 +1,3 @@
 extern "C" int addtwo(int);
 
-int addtwo(int N){
-  return N + 2;
-}
+int addtwo(int N){ return N + 2; }

cmake/compilers.cmake

@@ -35,11 +35,17 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
   "$<$<COMPILE_LANGUAGE:Fortran>:-traceback;-warn>"
   "$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Debug>>:-fpe0;-debug;-check>"
   )
+  if(NOT WIN32)
+    list(APPEND compile_opts "$<$<COMPILE_LANGUAGE:Fortran>:-fpscomp;logicals>")
+  endif()
+
 elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
   set(compile_opts -Wall -Wextra
   "$<$<VERSION_LESS:$<Fortran_COMPILER_VERSION>,12.0>:-Wno-maybe-uninitialized>"
   "$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Release>>:-fno-backtrace>"
   "$<$<COMPILE_LANGUAGE:Fortran>:-Werror=array-bounds;-Wconversion;-fimplicit-none>"
   "$<$<AND:$<COMPILE_LANGUAGE:Fortran>,$<CONFIG:Debug>>:-fexceptions;-ffpe-trap=invalid,zero,overflow;-fcheck=all>"
   )
+elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
+  set(compile_opts "$<$<COMPILE_LANGUAGE:Fortran>:-Munixlogical>")
 endif()

options.cmake

@@ -9,6 +9,7 @@ add_library(shapes OBJECT shapes.f90 fields.f90 rot90.f90)
 target_link_libraries(shapes PRIVATE random)
 
 add_library(sleep OBJECT sleep.cpp sleep.f90)
+target_compile_features(sleep PRIVATE cxx_std_11)
 
 add_library(cinter OBJECT cinter.f90 cinter.c
 $<$<NOT:$<BOOL:${HAVE_Fortran_GETCH}>>:getch.c>

src/CMakeLists.txt

@@ -1,22 +1,23 @@
 #include <stdio.h>
 
-extern void c_sleep(int*);
-
 #ifdef _MSC_VER
-
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#else
+#include <stdlib.h>
+#include <time.h>
+#include <errno.h>
+#endif
+
+void c_sleep(int*);
 
+
+#ifdef _MSC_VER
 // https://docs.microsoft.com/en-us/windows/win32/api/synchapi/nf-synchapi-sleep
 void c_sleep(int* milliseconds){
   Sleep(*milliseconds);
 }
-
 #else
-
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
 // https://linux.die.net/man/3/usleep
 void c_sleep(int* milliseconds)
 {
@@ -55,5 +56,4 @@ void c_sleep(int* milliseconds)
     }
   }
 }
-
 #endif

src/sleep.c

@@ -32,7 +32,7 @@ set_property(TARGET curses_test menu_test testkeys PROPERTY LINKER_LANGUAGE Fort
 
 set_tests_properties(cursesLib title_screen PROPERTIES
 LABELS gui
-DISABLED $<BOOL:${CI}>
+DISABLED $<BOOL:$ENV{CI}>
 RESOURCE_LOCK display
 DEPENDS "shapes;motion;random"
 )