Menu
▾
▴
[xml-cppdom-checkins] SF.net SVN: xml-cppdom:[704] trunk
|
From: <pat...@us...> - 2012-07-31 16:57:49
|
Revision: 704
http://xml-cppdom.svn.sourceforge.net/xml-cppdom/?rev=704&view=rev
Author: patrickh
Date: 2012-07-31 16:57:43 +0000 (Tue, 31 Jul 2012)
Log Message:
-----------
Change hard tabs to four space indentation.
Submitted by: Doug McCorkle
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/cppdom/CMakeLists.txt
trunk/test/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-07-30 15:14:17 UTC (rev 703)
+++ trunk/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
@@ -12,7 +12,7 @@
set(CPACK_PACKAGE_VERSION_MINOR "3")
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_VERSION
- "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+ "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
set(VERSION_UNDERSCORES "${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}")
###
@@ -21,22 +21,22 @@
# TODO this is not ideal/complete
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- set(arch "x86_64")
- set(ARCH_DIR lib64)
+ set(arch "x86_64")
+ set(ARCH_DIR lib64)
else()
- set(arch "x86")
- set(ARCH_DIR lib)
+ set(arch "x86")
+ set(ARCH_DIR lib)
endif()
# Define directories
set(BIN_DIR bin)
set(FLAGPOLL_INFO_DIR share/flagpoll)
if(WIN32)
- set(LIB_DIR bin)
- set(INCLUDE_DIR include)
+ set(LIB_DIR bin)
+ set(INCLUDE_DIR include)
else()
- set(LIB_DIR ${ARCH_DIR})
- set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
+ set(LIB_DIR ${ARCH_DIR})
+ set(INCLUDE_DIR include/cppdom-${CPACK_PACKAGE_VERSION})
endif()
# Create flagpoll file
@@ -48,25 +48,25 @@
set(libdir "\${fp_file_cwd}/../../${LIB_DIR}")
if(CMAKE_COMPILER_IS_GNUCXX)
- set(cppdom_cxxflags "-Wno-deprecated")
- set(include_path_flag "-I")
- set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")
- set(lib_path_flag "-L")
+ set(cppdom_cxxflags "-Wno-deprecated")
+ set(include_path_flag "-I")
+ set(cppdom_libs "-lcppdom-${VERSION_UNDERSCORES}")
+ set(lib_path_flag "-L")
elseif(MSVC)
- set(include_path_flag "/I")
- set(lib_path_flag "/L")
+ set(include_path_flag "/I")
+ set(lib_path_flag "/L")
else()
- message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
+ message(FATAL_ERROR "Compiler not recognized - can't generate values for Flagpoll file")
endif()
configure_file(cppdom.fpc.in "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc" @ONLY)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cppdom.fpc"
- DESTINATION ${FLAGPOLL_INFO_DIR}
- COMPONENT Development)
+ DESTINATION ${FLAGPOLL_INFO_DIR}
+ COMPONENT Development)
install(FILES cppdom-config
- DESTINATION ${BIN_DIR}
- COMPONENT Development)
+ DESTINATION ${BIN_DIR}
+ COMPONENT Development)
###
# Perform build configuration of dependencies
@@ -91,12 +91,12 @@
# Choose desired package generators
if(APPLE)
- set(CPACK_GENERATOR DragNDrop)
- set(CPACK_SOURCE_GENERATOR ZIP)
+ set(CPACK_GENERATOR DragNDrop)
+ set(CPACK_SOURCE_GENERATOR ZIP)
elseif(WIN32)
- set(CPACK_SOURCE_GENERATOR ZIP)
+ set(CPACK_SOURCE_GENERATOR ZIP)
else()
- set(CPACK_SOURCE_GENERATOR TARGZ)
+ set(CPACK_SOURCE_GENERATOR TARGZ)
endif()
# Include the packaging system now that we have it all set up
Modified: trunk/cppdom/CMakeLists.txt
===================================================================
--- trunk/cppdom/CMakeLists.txt 2012-07-30 15:14:17 UTC (rev 703)
+++ trunk/cppdom/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
@@ -8,25 +8,25 @@
configure_file(version.h.in "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY)
set(API
- config.h
- cppdom.h
- predicates.h
- shared_ptr.h
- xmlparser.h
- xmltokenizer.h
- version.h)
+ config.h
+ cppdom.h
+ predicates.h
+ shared_ptr.h
+ xmlparser.h
+ xmltokenizer.h
+ version.h)
set(EXT_API
- ext/OptionRepository.h)
+ ext/OptionRepository.h)
set(SOURCES
- cppdom.cpp
- xmlparser.cpp
- xmltokenizer.cpp
- ext/OptionRepository.cpp)
+ cppdom.cpp
+ xmlparser.cpp
+ xmltokenizer.cpp
+ ext/OptionRepository.cpp)
if(BOOST_FOUND)
- include_directories(${Boost_INCLUDE_DIRS})
- list(APPEND SOURCES SpiritParser.cpp)
- list(APPEND API SpiritParser.h)
+ include_directories(${Boost_INCLUDE_DIRS})
+ list(APPEND SOURCES SpiritParser.cpp)
+ list(APPEND API SpiritParser.h)
endif()
add_definitions(-DCPPDOM_EXPORTS)
@@ -39,13 +39,13 @@
add_library(cppdom SHARED ${API} ${EXT_API} ${SOURCES})
set_target_properties(cppdom PROPERTIES
- PUBLIC_HEADER "${API}"
- COMPILE_DEFINITIONS_DEBUG "CPPDOM_DEBUG")
+ PUBLIC_HEADER "${API}"
+ COMPILE_DEFINITIONS_DEBUG "CPPDOM_DEBUG")
install(TARGETS cppdom
- RUNTIME DESTINATION ${BIN_DIR} COMPONENT Runtime
- LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime
- ARCHIVE DESTINATION ${ARCH_DIR} COMPONENT Development
- PUBLIC_HEADER DESTINATION ${INCLUDE_DIR}/cppdom COMPONENT Development)
+ RUNTIME DESTINATION ${BIN_DIR} COMPONENT Runtime
+ LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime
+ ARCHIVE DESTINATION ${ARCH_DIR} COMPONENT Development
+ PUBLIC_HEADER DESTINATION ${INCLUDE_DIR}/cppdom COMPONENT Development)
install(FILES ${EXT_API}
- DESTINATION ${INCLUDE_DIR}/cppdom/ext
- COMPONENT Development)
+ DESTINATION ${INCLUDE_DIR}/cppdom/ext
+ COMPONENT Development)
Modified: trunk/test/CMakeLists.txt
===================================================================
--- trunk/test/CMakeLists.txt 2012-07-30 15:14:17 UTC (rev 703)
+++ trunk/test/CMakeLists.txt 2012-07-31 16:57:43 UTC (rev 704)
@@ -1,36 +1,36 @@
find_package(cppunit)
if(CPPUNIT_FOUND)
- add_subdirectory(suite)
+ add_subdirectory(suite)
endif()
if(BUILD_TESTING)
- include_directories(.)
+ include_directories(.)
- # maketree
- add_executable(maketree maketree.cpp)
- target_link_libraries(maketree cppdom)
- add_test(NAME maketree
- COMMAND maketree)
+ # maketree
+ add_executable(maketree maketree.cpp)
+ target_link_libraries(maketree cppdom)
+ add_test(NAME maketree
+ COMMAND maketree)
- # nodetest
- include(CopyResourcesToBuildTree)
- add_executable(nodetest nodetest.cpp game.xml)
- set_target_properties(nodetest PROPERTIES RESOURCE "game.xml")
- target_link_libraries(nodetest cppdom)
- copy_resources_to_build_tree(nodetest)
- add_test(NAME nodetest
- COMMAND nodetest)
- set_tests_properties(nodetest PROPERTIES
- FAIL_REGULAR_EXPRESSION "[eE]rror"
- PASS_REGULAR_EXPRESSION "in name: bokbokbok")
+ # nodetest
+ include(CopyResourcesToBuildTree)
+ add_executable(nodetest nodetest.cpp game.xml)
+ set_target_properties(nodetest PROPERTIES RESOURCE "game.xml")
+ target_link_libraries(nodetest cppdom)
+ copy_resources_to_build_tree(nodetest)
+ add_test(NAME nodetest
+ COMMAND nodetest)
+ set_tests_properties(nodetest PROPERTIES
+ FAIL_REGULAR_EXPRESSION "[eE]rror"
+ PASS_REGULAR_EXPRESSION "in name: bokbokbok")
- # parsetest
- add_executable(parsetest parsetest.cpp)
- target_link_libraries(parsetest cppdom)
- foreach(testfile game.xml hamlet.xml nodetest.xml test.xml)
- add_test(NAME parsetest-${testfile}
- COMMAND parsetest "${CMAKE_CURRENT_SOURCE_DIR}/${testfile}")
- set_tests_properties(parsetest-${testfile} PROPERTIES
- FAIL_REGULAR_EXPRESSION "[eE]rror")
- endforeach()
+ # parsetest
+ add_executable(parsetest parsetest.cpp)
+ target_link_libraries(parsetest cppdom)
+ foreach(testfile game.xml hamlet.xml nodetest.xml test.xml)
+ add_test(NAME parsetest-${testfile}
+ COMMAND parsetest "${CMAKE_CURRENT_SOURCE_DIR}/${testfile}")
+ set_tests_properties(parsetest-${testfile} PROPERTIES
+ FAIL_REGULAR_EXPRESSION "[eE]rror")
+ endforeach()
endif()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
