gtest for msvs 2015 RC

KjellSchubert · May 19, 2015 · fe29960 · fe29960
1 parent 7c64639
commit fe29960
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 29 deletions.
diff --git a/library/gflags/2.1.1.bru → library/gflags/2.1.2.bru b/library/gflags/2.1.1.bru → library/gflags/2.1.2.bru
@@ -1,13 +1,18 @@
 {
     "homepage": "https://code.google.com/p/gflags",
     # releases moved to github
-    "url": "https://github.com/schuhschuh/gflags/archive/v2.1.1.tar.gz",
+
+    # was: "url": "https://github.com/schuhschuh/gflags/archive/v2.1.2.tar.gz",
+    # but this doesn't build with vs 2015, here's the patch:
+    "url": "git+https://github.com/KjellSchubert/gflags.git@4a56d614cfd21d33c7d65ebc3c4ed0eb3cda0807",
+
     "module": "gflags",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "make_command": {
         # Requires 'sudo apt-get install cmake' if you didn't install that yet.
         # This is the equivalent of ./configure, it doesn't compile the code.
-        "Linux": "cd gflags-2.1.1 ; cmake ."
+        "Linux": "cd clone ; cmake .",
+        "Windows": "cd clone ; cmake ."
     },
     "dependencies": {
         "googletest": "1.7.0"

diff --git a/library/gflags/2.1.1.gyp → library/gflags/2.1.2.gyp b/library/gflags/2.1.1.gyp → library/gflags/2.1.2.gyp
@@ -5,69 +5,67 @@
             "type": "static_library",
             "include_dirs": [
                 # the include dir is created by cmake
-                "2.1.1/gflags-2.1.1/include/gflags"
-                #"2.1.1/gflags-2.1.1/src"
+                "2.1.2/clone/include/gflags"
             ],
             "sources": [
-                "2.1.1/gflags-2.1.1/src/*.cc"
-            ],
-            "sources!": [
-                "2.1.1/gflags-2.1.1/src/windows_port.cc"
+                "2.1.2/clone/src/*.cc"
             ],
             "direct_dependent_settings": {
                 "include_dirs": [
-                    "2.1.1/gflags-2.1.1/include"
+                    "2.1.2/clone/include"
                 ]
             },
             "conditions": [
 
+                ["OS!='win'", {
+                    "sources!": [
+                        "2.1.2/clone/src/windows_port.cc"
+                    ],
+                    "link_settings": {
+                        "libraries": [ "-lpthread" ]
+                    }
+                }],
+
                 ["OS=='win'", {
-                  "defines": [
-                    # TODO
-                  ],
-                  "direct_dependent_settings": {
-                    "defines": [
-                      # TODO
-                    ]
-                  }
+                    "link_settings": {
+                        "libraries": [ "-lshlwapi.lib" ]  # PathMatchSpec
+                    }
                 }]
             ]
         },
 
         {
             "target_name": "gflags_unittest",
             "type" : "executable",
-            
+
             # Test keeps failing. TODO
             #"test": {
-            #    "cwd": "2.1.1/gflags-2.1.1"
+            #    "cwd": "2.1.2/clone"
             #},
-            
+
             "include_dirs": [
-                "2.1.1/gflags-2.1.1/include/gflags", # config.h
-                "2.1.1/gflags-2.1.1/src" # util.h
+                "2.1.2/clone/include/gflags", # config.h
+                "2.1.2/clone/src" # util.h
             ],
             "sources" : [
-                "2.1.1/gflags-2.1.1/test/gflags_unittest.cc"
+                "2.1.2/clone/test/gflags_unittest.cc"
             ],
-            "libraries": [ "-lpthread" ],
             "dependencies" : [
                 "gflags",
                 "../googletest/googletest.gyp:*"
             ]
         },
-        
+
         # this is more an example than a test? Doesnt print the message it
         # advertises, kinda unclear, at least it exits without errors...
         {
             "target_name": "gflags_declaretest",
             "type" : "executable",
             "test": {},
             "sources" : [
-                "2.1.1/gflags-2.1.1/test/gflags_declare_flags.cc",
-                "2.1.1/gflags-2.1.1/test/gflags_declare_test.cc"
+                "2.1.2/clone/test/gflags_declare_flags.cc",
+                "2.1.2/clone/test/gflags_declare_test.cc"
             ],
-            "libraries": [ "-lpthread" ],
             "dependencies" : [
                 "gflags"
             ]