diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2019-06-05 11:25:32 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2019-06-05 11:26:17 +0300 |
| commit | dbe3cf713d85b273105e2d71c590416328bdf6fe (patch) | |
| tree | c1c2130deca55cef8132ae7dcece08f5c82089c4 | |
| parent | f5006fcc53023d40c7477f6eeca916e475d2b3f4 (diff) | |
| download | bdwgc-dbe3cf713d85b273105e2d71c590416328bdf6fe.tar.gz | |
Move CMake cord specification and cord executable to cord folder
Issue #281 (bdwgc).
* CMakeLists.txt [WIN32]: Move add_executable, set_target_properties,
target_link_libraries for cord to cord/CMakeLists.txt.
* CMakeLists.txt (cord): Specify add_subdirectory.
* Makefile.am (EXTRA_DIST): Add cord/CMakeLists.txt.
* cord/CMakeLists.txt: New file.
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | cord/CMakeLists.txt | 21 |
3 files changed, 23 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fff6fe8..8d386ca5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -253,13 +253,6 @@ set_target_properties(gcmt-lib PROPERTIES add_library(gcmt-dll SHARED ${SRC}) -if (WIN32) - add_executable(cord cord/cordbscs.c cord/cordxtra.c - cord/tests/de.c cord/tests/de_win.c) - set_target_properties(cord PROPERTIES WIN32_EXECUTABLE TRUE) - set_target_properties(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) - target_link_libraries(cord gc-lib) - target_link_libraries(cord gdi32) -endif() +add_subdirectory(cord) add_subdirectory(tests) diff --git a/Makefile.am b/Makefile.am index bb6389f1..5de2657f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -199,7 +199,7 @@ EXTRA_DIST += README.QUICK EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \ OS2_MAKEFILE PCR-Makefile digimars.mak \ Makefile.direct SMakefile.amiga WCC_MAKEFILE autogen.sh \ - CMakeLists.txt tests/CMakeLists.txt + CMakeLists.txt cord/CMakeLists.txt tests/CMakeLists.txt # files used by makefiles other than Makefile.am # diff --git a/cord/CMakeLists.txt b/cord/CMakeLists.txt new file mode 100644 index 00000000..17077370 --- /dev/null +++ b/cord/CMakeLists.txt @@ -0,0 +1,21 @@ +# +# Copyright (c) 2000-2010 by Hewlett-Packard Company. All rights reserved. +## +# THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED +# OR IMPLIED. ANY USE IS AT YOUR OWN RISK. +## +# Permission is hereby granted to use or copy this program +# for any purpose, provided the above notices are retained on all copies. +# Permission to modify the code and to distribute modified code is granted, +# provided the above notices are retained, and a notice that the code was +# modified is included with the above copyright notice. +## + +if (WIN32) + add_executable(cord cordbscs.c cordxtra.c + tests/de.c tests/de_win.c) + set_target_properties(cord PROPERTIES WIN32_EXECUTABLE TRUE) + set_target_properties(cord PROPERTIES COMPILE_DEFINITIONS GC_NOT_DLL) + target_link_libraries(cord gc-lib) + target_link_libraries(cord gdi32) +endif() |