From: Alan W. I. <ai...@us...> - 2006-12-04 21:19:54
|
Update of /cvsroot/plplot/plplot/examples/c++ In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15522/examples/c++ Modified Files: CMakeLists.txt Log Message: cmake-2.4.5 has "Fix target name matching custom command output conflict" so revert workaround for this bug in 2.4.4. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/plplot/plplot/examples/c++/CMakeLists.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- CMakeLists.txt 1 Dec 2006 14:48:00 -0000 1.12 +++ CMakeLists.txt 4 Dec 2006 21:19:52 -0000 1.13 @@ -65,23 +65,12 @@ foreach(STRING_INDEX ${cxx_STRING_INDICES}) set(cxx_SRCS ${cxx_SRCS} x${STRING_INDEX}.cc) if(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES) - # disambiguate prefix to workaround 2.4.4 bug which interferes with - # all OUTPUTS with x?? if you don't disambiguate. - add_executable(disambiguate_x${STRING_INDEX} x${STRING_INDEX}.cc) + add_executable(x${STRING_INDEX} x${STRING_INDEX}.cc) if(WIN32 AND BUILD_SHARED_LIBS) SET_SOURCE_FILES_PROPERTIES(x${STRING_INDEX}.cc PROPERTIES COMPILE_FLAGS "-DUSINGDLL" ) endif(WIN32 AND BUILD_SHARED_LIBS) - target_link_libraries( - disambiguate_x${STRING_INDEX} - plplotcxx${LIB_TAG} - ${MATH_LIB} - ) - # Actual name of executable must not have the disambiguate prefix. - set_target_properties( - disambiguate_x${STRING_INDEX} - PROPERTIES OUTPUT_NAME x${STRING_INDEX} - ) + target_link_libraries(x${STRING_INDEX} plplotcxx${LIB_TAG} ${MATH_LIB}) endif(BUILD_TEST AND ENABLE_BUILDTREE_EXAMPLES) endforeach(STRING_INDEX ${cxx_STRING_INDICES}) |