diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 438a636..5743753 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -33,8 +33,8 @@ - - + + @@ -56,10 +56,10 @@ - + - + @@ -68,11 +68,11 @@ - - + + - - + + @@ -95,6 +95,7 @@ @@ -437,12 +438,12 @@ 1491540343823 - + - @@ -457,16 +458,16 @@ - + - + - + @@ -696,27 +697,9 @@ - - - - - - - - - - - - - - - - - - - + @@ -724,5 +707,23 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 0166b73..a674cea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,5 +3,5 @@ project(ftests) set(CMAKE_CXX_STANDARD 11) -set(SOURCE_FILES main.cpp src/loaders.cpp src/loaders.h src/jsoncpp.cpp) +set(SOURCE_FILES examplar.cpp src/loaders.cpp src/loaders.h src/jsoncpp.cpp) add_executable(ftests ${SOURCE_FILES}) \ No newline at end of file diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache index da5ac93..4e09fc3 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache +++ b/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache @@ -6,7 +6,7 @@ #IncludeRegexTransform: -/home/phanes/Development/internal/ftests/main.cpp +/home/phanes/Development/internal/ftests/examplar.cpp iostream - src/json/json.h diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake b/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake index ebe7454..305cc24 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake +++ b/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake @@ -4,7 +4,7 @@ set(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: set(CMAKE_DEPENDS_CHECK_CXX - "/home/phanes/Development/internal/ftests/main.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o" + "/home/phanes/Development/internal/ftests/examplar.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o" "/home/phanes/Development/internal/ftests/src/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/jsoncpp.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o" ) diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/build.make b/cmake-build-debug/CMakeFiles/ftests.dir/build.make index 73e9634..1e4edf1 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/build.make +++ b/cmake-build-debug/CMakeFiles/ftests.dir/build.make @@ -57,28 +57,28 @@ include CMakeFiles/ftests.dir/progress.make # Include the compile flags for this target's objects. include CMakeFiles/ftests.dir/flags.make -CMakeFiles/ftests.dir/main.cpp.o: CMakeFiles/ftests.dir/flags.make -CMakeFiles/ftests.dir/main.cpp.o: ../main.cpp - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/ftests.dir/main.cpp.o" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/main.cpp.o -c /home/phanes/Development/internal/ftests/main.cpp +CMakeFiles/ftests.dir/examplar.cpp.o: CMakeFiles/ftests.dir/flags.make +CMakeFiles/ftests.dir/examplar.cpp.o: ../examplar.cpp + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/ftests.dir/examplar.cpp.o" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/examplar.cpp.o -c /home/phanes/Development/internal/ftests/examplar.cpp -CMakeFiles/ftests.dir/main.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/main.cpp.i" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/main.cpp > CMakeFiles/ftests.dir/main.cpp.i +CMakeFiles/ftests.dir/examplar.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/examplar.cpp.i" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/examplar.cpp > CMakeFiles/ftests.dir/examplar.cpp.i -CMakeFiles/ftests.dir/main.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/main.cpp.s" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/main.cpp -o CMakeFiles/ftests.dir/main.cpp.s +CMakeFiles/ftests.dir/examplar.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/examplar.cpp.s" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/examplar.cpp -o CMakeFiles/ftests.dir/examplar.cpp.s -CMakeFiles/ftests.dir/main.cpp.o.requires: +CMakeFiles/ftests.dir/examplar.cpp.o.requires: -.PHONY : CMakeFiles/ftests.dir/main.cpp.o.requires +.PHONY : CMakeFiles/ftests.dir/examplar.cpp.o.requires -CMakeFiles/ftests.dir/main.cpp.o.provides: CMakeFiles/ftests.dir/main.cpp.o.requires - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/main.cpp.o.provides.build -.PHONY : CMakeFiles/ftests.dir/main.cpp.o.provides +CMakeFiles/ftests.dir/examplar.cpp.o.provides: CMakeFiles/ftests.dir/examplar.cpp.o.requires + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/examplar.cpp.o.provides.build +.PHONY : CMakeFiles/ftests.dir/examplar.cpp.o.provides -CMakeFiles/ftests.dir/main.cpp.o.provides.build: CMakeFiles/ftests.dir/main.cpp.o +CMakeFiles/ftests.dir/examplar.cpp.o.provides.build: CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders.cpp.o: CMakeFiles/ftests.dir/flags.make @@ -131,14 +131,14 @@ CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/sr # Object files for target ftests ftests_OBJECTS = \ -"CMakeFiles/ftests.dir/main.cpp.o" \ +"CMakeFiles/ftests.dir/examplar.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders.cpp.o" \ "CMakeFiles/ftests.dir/src/jsoncpp.cpp.o" # External object files for target ftests ftests_EXTERNAL_OBJECTS = -ftests: CMakeFiles/ftests.dir/main.cpp.o +ftests: CMakeFiles/ftests.dir/examplar.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders.cpp.o ftests: CMakeFiles/ftests.dir/src/jsoncpp.cpp.o ftests: CMakeFiles/ftests.dir/build.make @@ -151,7 +151,7 @@ CMakeFiles/ftests.dir/build: ftests .PHONY : CMakeFiles/ftests.dir/build -CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/main.cpp.o.requires +CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/examplar.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/jsoncpp.cpp.o.requires diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake b/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake index 68d58fc..7e0ff02 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake +++ b/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake @@ -1,5 +1,5 @@ file(REMOVE_RECURSE - "CMakeFiles/ftests.dir/main.cpp.o" + "CMakeFiles/ftests.dir/examplar.cpp.o" "CMakeFiles/ftests.dir/src/loaders.cpp.o" "CMakeFiles/ftests.dir/src/jsoncpp.cpp.o" "ftests.pdb" diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal b/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal index 5418fae..dd0f35c 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal +++ b/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal @@ -1,8 +1,8 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.5 -CMakeFiles/ftests.dir/main.cpp.o - /home/phanes/Development/internal/ftests/main.cpp +CMakeFiles/ftests.dir/examplar.cpp.o + /home/phanes/Development/internal/ftests/examplar.cpp /home/phanes/Development/internal/ftests/src/json/json-forwards.h /home/phanes/Development/internal/ftests/src/json/json.h /home/phanes/Development/internal/ftests/src/loaders.h diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/depend.make b/cmake-build-debug/CMakeFiles/ftests.dir/depend.make index 04dc843..8c50a30 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/depend.make +++ b/cmake-build-debug/CMakeFiles/ftests.dir/depend.make @@ -1,10 +1,10 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 3.5 -CMakeFiles/ftests.dir/main.cpp.o: ../main.cpp -CMakeFiles/ftests.dir/main.cpp.o: ../src/json/json-forwards.h -CMakeFiles/ftests.dir/main.cpp.o: ../src/json/json.h -CMakeFiles/ftests.dir/main.cpp.o: ../src/loaders.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../examplar.cpp +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json-forwards.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json.h +CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders.h CMakeFiles/ftests.dir/src/jsoncpp.cpp.o: ../src/json/json.h CMakeFiles/ftests.dir/src/jsoncpp.cpp.o: ../src/jsoncpp.cpp diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o new file mode 100644 index 0000000..09bd1cc Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o differ diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/link.txt b/cmake-build-debug/CMakeFiles/ftests.dir/link.txt index 984a749..ef8be89 100644 --- a/cmake-build-debug/CMakeFiles/ftests.dir/link.txt +++ b/cmake-build-debug/CMakeFiles/ftests.dir/link.txt @@ -1 +1 @@ -/usr/bin/c++ -g CMakeFiles/ftests.dir/main.cpp.o CMakeFiles/ftests.dir/src/loaders.cpp.o CMakeFiles/ftests.dir/src/jsoncpp.cpp.o -o ftests +/usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders.cpp.o CMakeFiles/ftests.dir/src/jsoncpp.cpp.o -o ftests diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o deleted file mode 100644 index 773e0c9..0000000 Binary files a/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o and /dev/null differ diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o index 7c7cb3e..4d063fd 100644 Binary files a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o differ diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile index deb87bf..7ae537f 100644 --- a/cmake-build-debug/Makefile +++ b/cmake-build-debug/Makefile @@ -123,32 +123,32 @@ ftests/fast: $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/build .PHONY : ftests/fast -main.o: main.cpp.o +examplar.o: examplar.cpp.o -.PHONY : main.o +.PHONY : examplar.o # target to build an object file -main.cpp.o: - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/main.cpp.o -.PHONY : main.cpp.o +examplar.cpp.o: + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/examplar.cpp.o +.PHONY : examplar.cpp.o -main.i: main.cpp.i +examplar.i: examplar.cpp.i -.PHONY : main.i +.PHONY : examplar.i # target to preprocess a source file -main.cpp.i: - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/main.cpp.i -.PHONY : main.cpp.i +examplar.cpp.i: + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/examplar.cpp.i +.PHONY : examplar.cpp.i -main.s: main.cpp.s +examplar.s: examplar.cpp.s -.PHONY : main.s +.PHONY : examplar.s # target to generate assembly for a file -main.cpp.s: - $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/main.cpp.s -.PHONY : main.cpp.s +examplar.cpp.s: + $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/examplar.cpp.s +.PHONY : examplar.cpp.s src/jsoncpp.o: src/jsoncpp.cpp.o @@ -213,9 +213,9 @@ help: @echo "... edit_cache" @echo "... rebuild_cache" @echo "... ftests" - @echo "... main.o" - @echo "... main.i" - @echo "... main.s" + @echo "... examplar.o" + @echo "... examplar.i" + @echo "... examplar.s" @echo "... src/jsoncpp.o" @echo "... src/jsoncpp.i" @echo "... src/jsoncpp.s" diff --git a/cmake-build-debug/ftests b/cmake-build-debug/ftests index c7f929c..ae56491 100755 Binary files a/cmake-build-debug/ftests and b/cmake-build-debug/ftests differ diff --git a/cmake-build-debug/ftests.cbp b/cmake-build-debug/ftests.cbp index d84f8fa..8271347 100644 --- a/cmake-build-debug/ftests.cbp +++ b/cmake-build-debug/ftests.cbp @@ -84,20 +84,20 @@ - + - + + - + + - + + - + + + diff --git a/main.cpp b/examplar.cpp similarity index 98% rename from main.cpp rename to examplar.cpp index 60d4233..e93ae28 100644 --- a/main.cpp +++ b/examplar.cpp @@ -11,7 +11,7 @@ int main() for ( int i = 0; i < plan.tasks.size(); ++i ) { std::cout << plan.tasks[i].get_name() << std::endl; - } + }d