Revision: 57348
http://sourceforge.net/p/brlcad/code/57348
Author: starseeker
Date: 2013-08-31 00:33:15 +0000 (Sat, 31 Aug 2013)
Log Message:
-----------
If we're using SC_BINARY_DIR to generate these files, need to use it for the
install rule too - SC_BINARY_DIR doesn't always equal CMAKE_BINARY_DIR
Modified Paths:
--------------
brlcad/trunk/src/other/stepcode/CMakeLists.txt
brlcad/trunk/src/other/stepcode/include/CMakeLists.txt
Modified: brlcad/trunk/src/other/stepcode/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/CMakeLists.txt 2013-08-31 00:31:03 UTC
(rev 57347)
+++ brlcad/trunk/src/other/stepcode/CMakeLists.txt 2013-08-31 00:33:15 UTC
(rev 57348)
@@ -360,7 +360,7 @@
# Now that all the tests are done, configure the sc_cf.h file:
get_property(CONFIG_H_FILE_CONTENTS GLOBAL PROPERTY SC_CONFIG_H_CONTENTS)
file(WRITE ${CONFIG_H_FILE} "${CONFIG_H_FILE_CONTENTS}")
-configure_file(${CONFIG_H_FILE} ${SC_BINARY_DIR}/include/sc_cf.h)
+configure_file(${CONFIG_H_FILE}
${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h)
################ create sc_version_string.h,
http://stackoverflow.com/questions/3780667
# Using 'ver_string' instead of 'sc_version_string.h' is a trick to force the
@@ -369,12 +369,12 @@
configure_file(${SC_CMAKE_DIR}/sc_version_string.cmake
${SC_BINARY_DIR}/sc_version_string.cmake @ONLY)
add_custom_target(version_string ALL DEPENDS ver_string )
# creates sc_version_string.h using cmake script
-add_custom_command(OUTPUT ver_string
${CMAKE_CURRENT_BINARY_DIR}/include/sc_version_string.h
+add_custom_command(OUTPUT ver_string
${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${SC_SOURCE_DIR}
-DBINARY_DIR=${SC_BINARY_DIR}
-P
${SC_BINARY_DIR}/sc_version_string.cmake)
# sc_version_string.h is a generated file
-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/include/sc_version_string.h
+set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
PROPERTIES GENERATED TRUE
HEADER_FILE_ONLY TRUE )
################
Modified: brlcad/trunk/src/other/stepcode/include/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/stepcode/include/CMakeLists.txt 2013-08-31
00:31:03 UTC (rev 57347)
+++ brlcad/trunk/src/other/stepcode/include/CMakeLists.txt 2013-08-31
00:33:15 UTC (rev 57348)
@@ -35,6 +35,6 @@
sc_stdbool.h
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
-install(FILES ${CMAKE_BINARY_DIR}/include/sc_cf.h
- ${CMAKE_BINARY_DIR}/include/sc_version_string.h
+install(FILES ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_cf.h
+ ${SC_BINARY_DIR}/${INCLUDE_INSTALL_DIR}/sc_version_string.h
DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
