[cig-commits] [commit] master: Add config.h to CMake files (cc72271)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Wed Oct 29 16:20:32 PDT 2014


Repository : https://github.com/geodynamics/vq

On branch  : master
Link       : https://github.com/geodynamics/vq/compare/0ca7695073f8b223d815f10653613b02b6c47df8...197914f4e03e55d321cae45161deafb1a5ade706

>---------------------------------------------------------------

commit cc72271a197821186a7c2ba1d6c87470799644c6
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Wed Oct 29 13:19:39 2014 -0700

    Add config.h to CMake files


>---------------------------------------------------------------

cc72271a197821186a7c2ba1d6c87470799644c6
 quakelib/CMakeLists.txt | 1 +
 src/CMakeLists.txt      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/quakelib/CMakeLists.txt b/quakelib/CMakeLists.txt
index 0d92a5e..d6f17d6 100644
--- a/quakelib/CMakeLists.txt
+++ b/quakelib/CMakeLists.txt
@@ -127,6 +127,7 @@ SET(QUAKELIB_HEADERS
     ${QUAKELIB_SOURCE_DIR}/QuakeLibIO.h
     ${QUAKELIB_SOURCE_DIR}/QuakeLibOkada.h
     ${QUAKELIB_SOURCE_DIR}/QuakeLibUtil.h
+    ${CMAKE_CURRENT_BINARY_DIR}/quakelib_config.h
     )
 
 # Build the QuakeLib library
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 391749b..05e08e1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -88,8 +88,8 @@ SET(VQ_CORE
     )
 
 # Add executable called "vq" that is built from the source files
-ADD_EXECUTABLE (vq main.cpp ${VQ_MISC} ${VQ_SIMULATION} ${VQ_IO} ${VQ_CORE})
-ADD_EXECUTABLE (mesher mesher.cpp)
+ADD_EXECUTABLE (vq main.cpp ${VQ_BINARY_DIR}/config.h ${VQ_MISC} ${VQ_SIMULATION} ${VQ_IO} ${VQ_CORE})
+ADD_EXECUTABLE (mesher ${VQ_BINARY_DIR}/config.h mesher.cpp)
 
 # Link the executables to the quakelib library.
 TARGET_LINK_LIBRARIES (vq quakelib)



More information about the CIG-COMMITS mailing list