Merge pull request #361 from nrc-fuels/CMake-windows

CMake on windows (MSVS solutions)

Author: jacobwilliams

CMakeLists.txt

@@ -11,6 +11,9 @@
 
 cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
 
+# Use MSVS folders to organize projects on windows
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 set(PROJECT_DESCRIPTION "A Fortran 2008 JSON API")
 set(PROJECT_URL "https://github.com/jacobwilliams/json-fortran")
 
@@ -239,7 +242,7 @@ if ( ENABLE_TESTS )
   enable_testing()
 
   # emulate GNU Autotools `make check`
-  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
+  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG>)
 
   find_program ( JSONLINT jsonlint )
   find_program ( DIFF     diff )

cmake/pickFortranCompilerFlags.cmake

@@ -8,16 +8,26 @@ if ( NOT Fortran_FLAGS_INIT )
     "Enable compiler run-time checks? (Enabling this will turn off most compiler optimizations.)" )
   mark_as_advanced ( ENABLE_RUNTIME_CHECKS )
 
+  if ( "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" )
+    set(pre /)
+    set(spc :)
+    set(Q /Q)
+  else()
+    set(pre -)
+    set(spc " ")
+    set(Q -)
+  endif()
   if ( "${CMAKE_Fortran_COMPILER_ID}" MATCHES "Intel" )
+    set(TRACE_FLAG -traceback)
     if ( ENABLE_BACK_TRACE )
-      set ( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -traceback")
+      set ( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${pre}traceback")
     endif ()
     if ( ENABLE_COMPILE_TIME_WARNINGS )
       # The following warning might be triggered by ifort unless explicitly silenced:
       # warning #7601: F2008 standard does not allow an internal procedure to be an actual argument procedure
       # name. (R1214.4). In the context of F2008 this is an erroneous warning.
       # See https://prd1idz.cps.intel.com/en-us/forums/topic/486629
-      set ( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -warn -stand f08 -diag-disable 7601 -diag-disable 5142" )
+      set ( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${pre}warn ${pre}stand${spc}f08 ${Q}diag-disable${spc}7601 ${Q}diag-disable${spc}5142" )
     endif ()
     if ( ENABLE_RUNTIME_CHECKS )
       set ( CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -check all" )

files/expected-outputs/hello-world-ascii.json

@@ -0,0 +1,23 @@
+{
+  "hello world": {
+    "Chinese": "\u4f60\u597d\u4e16\u754c",
+    "Dutch": "Hello wereld",
+    "English": "Hello world",
+    "French": "Bonjour monde",
+    "German": "Hallo Welt",
+    "Greek": "\u03b3\u03b5\u03b9\u03ac \u03c3\u03bf\u03c5 \u03ba\u03cc\u03c3\u03bc\u03bf\u03c2",
+    "Italian": "Ciao mondo",
+    "Japanese": "\u3053\u3093\u306b\u3061\u306f\u4e16\u754c",
+    "Korean": "\uc5ec\ubcf4\uc138\uc694 \uc138\uacc4",
+    "Portuguese": "Ol\u00e1 mundo",
+    "Russian": "\u0417\u0434\u0440\u0430\u0432\u0441\u0442\u0432\u0443\u043b\u0442\u0435 \u043c\u0438\u0440",
+    "Spanish": "Hola mundo",
+    "Amharic": "\u1235\u120b\u121d \u12a0\u1208\u121d",
+    "Hebrew": "\u05e9\u05dc\u05d5\u05dd \u05e2\u05d5\u05dc\u05dd",
+    "Hindi": "\u0939\u0948\u0932\u094b \u0935\u0930\u094d\u0932\u094d\u0921",
+    "Arabic": "\u0645\u0631\u062d\u0628\u0627 \u0628\u0627\u0644\u0639\u0627\u0644\u0645",
+    "Urdu": "\u06c1\u06cc\u0644\u0648 \u062f\u0646\u06cc\u0627",
+    "Thai": "\u0e2a\u0e27\u0e31\u0e2a\u0e14\u0e35\u0e0a\u0e32\u0e27\u0e42\u0e25\u0e01"
+  },
+  "UCS4 support?": "\u2713"
+}

files/expected-outputs/hello-world-ascii.json

@@ -0,0 +1,23 @@
+{
+  "hello world": {
+    "Chinese": "你好世界",
+    "Dutch": "Hello wereld",
+    "English": "Hello world",
+    "French": "Bonjour monde",
+    "German": "Hallo Welt",
+    "Greek": "γειά σου κόσμος",
+    "Italian": "Ciao mondo",
+    "Japanese": "こんにちは世界",
+    "Korean": "여보세요 세계",
+    "Portuguese": "Olá mundo",
+    "Russian": "Здравствулте мир",
+    "Spanish": "Hola mundo",
+    "Amharic": "ስላም አለም",
+    "Hebrew": "שלום עולם",
+    "Hindi": "हैलो वर्ल्ड",
+    "Arabic": "مرحبا بالعالم",
+    "Urdu": "ہیلو دنیا",
+    "Thai": "สวัสดีชาวโลก"
+  },
+  "UCS4 support?": "✓"
+}

files/expected-outputs/hello-world-ucs4.json

@@ -0,0 +1,93 @@
+{
+  "inputs": {
+    "t0": 0.1E+0,
+    "tf": 0.11E+1,
+    "x0": 0.9999E+4,
+    "integer_scalar": 1,
+    "integer_array": [
+      2,
+      4,
+      99
+    ],
+    "names": [
+      "aaa",
+      "bbb",
+      "ccc"
+    ],
+    "logical_scalar": true,
+    "logical_vector": [
+      true,
+      false,
+      true
+    ],
+    "null_variable": null
+  },
+  "trajectory": [
+    {
+      "VARIABLE": "Rx",
+      "UNITS": "km",
+      "FRAME": "J2000",
+      "CENTER": "EARTH",
+      "DATA": [
+        0.1E+1,
+        0.2E+1,
+        0.3E+1
+      ]
+    },
+    {
+      "VARIABLE": "Ry",
+      "UNITS": "km",
+      "FRAME": "J2000",
+      "CENTER": "EARTH",
+      "DATA": [
+        0.1E+2,
+        0.2E+2,
+        0.3E+2
+      ]
+    },
+    {
+      "VARIABLE": "Rz",
+      "UNITS": "km",
+      "FRAME": "J2000",
+      "CENTER": "EARTH",
+      "DATA": [
+        0.1E+3,
+        0.2E+3,
+        0.3E+3
+      ]
+    },
+    {
+      "VARIABLE": "Vx",
+      "UNITS": "km\/s",
+      "FRAME": "J2000",
+      "CENTER": "EARTH",
+      "DATA": [
+        0.1E-2,
+        0.2E-2,
+        0.3E-2
+      ]
+    },
+    {
+      "VARIABLE": "Vy",
+      "UNITS": "km\/s",
+      "FRAME": "J2000",
+      "CENTER": "EARTH",
+      "DATA": [
+        0.2E-2,
+        0.2E-1,
+        0.3E-2
+      ]
+    },
+    {
+      "VARIABLE": "Vz",
+      "UNITS": "km\/s",
+      "FRAME": "J2000",
+      "CENTER": "EARTH",
+      "DATA": [
+        0.3E-2,
+        0.3E-1,
+        0.4E-1
+      ]
+    }
+  ]
+}