Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Unified Diff: test/library_dirs/subdir/test-win.gyp

Issue 25594002: Revert homogenize msvs and ninja library_dir and libraries settings for (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/library_dirs/subdir/test.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/library_dirs/subdir/test-win.gyp
diff --git a/test/library_dirs/subdir/test-win.gyp b/test/library_dirs/subdir/test-win.gyp
deleted file mode 100644
index 033b6f7fdd03c6652d11c95fa9afa3056bd97ed9..0000000000000000000000000000000000000000
--- a/test/library_dirs/subdir/test-win.gyp
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (c) 2013 Google Inc. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'targets': [
- {
- # This creates a static library and puts it in a nonstandard location for
- # libraries-search-path-test.
- 'target_name': 'mylib',
- 'type': 'static_library',
- 'standalone_static_library': 1,
- # This directory is NOT in the default library search locations. It also
- # MUST be passed in on the gyp command line:
- #
- # -D abs_path_to_secret_library_location=/some_absolute_path
- #
- # The gyptest itself (../gyptest-library-dirs.py) provides this.
- 'product_dir': '<(abs_path_to_secret_library_location)',
- 'sources': [
- 'mylib.cc',
- ],
- },
- {
- 'target_name': 'libraries-search-path-test-lib-suffix',
- 'type': 'executable',
- 'dependencies': [
- # It is important to NOT list the mylib as a dependency here, because
- # some build systems will track it down based on its product_dir,
- # such that the link succeeds even without the library_dirs below.
- #
- # The point of this weird structuring is to ensure that 'library_dirs'
- # works as advertised, such that just '-lmylib' (or its equivalent)
- # works based on the directories that library_dirs puts in the library
- # link path.
- #
- # If 'mylib' was listed as a proper dependency here, the build system
- # would find it and link with its path on disk.
- #
- # Note that this implies 'mylib' must already be built when building
- # 'libraries-search-path-test' (see ../gyptest-library-dirs.py).
- #
- #'mylib',
- ],
- 'sources': [
- 'hello.cc',
- ],
- # Note that without this, the mylib library would not be found and
- # successfully linked.
- 'library_dirs': [
- '<(abs_path_to_secret_library_location)',
- ],
- 'link_settings': {
- 'libraries': [
- '-lmylib.lib',
- ],
- },
- },
- ],
-}
« no previous file with comments | « test/library_dirs/subdir/test.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698