diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot b/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot index 405c049..0c367d0 100644 --- a/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/OMakeroot @@ -29,6 +29,8 @@ # Any of these can be deleted if you are not using them, # but you probably want to keep the Common file. # + +# 動作確認はCygwinのみ OSTYPE = Cygwin open build/C @@ -39,8 +41,7 @@ open build/C DefineCommandVars() # ビルド共通設定 -CXX = g++-4 -LDFLAGS += -L/usr/local/lib -lgtest -lgtest_main +include common/common.om # # Include the OMakefile in this directory. diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile index ed12add..e1d12d1 100644 --- a/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/RegionIdModifier/OMakefile @@ -20,11 +20,4 @@ $(TEST_TARGET)$(EXT_OBJ): ../../../ConsoleRestore/$(TEST_TARGET).cpp .DEFAULT: $(TEST_TARGET)$(EXT_OBJ) $(TARGET)$(EXE) -CXXProgram($(TARGET), $(SRC_FILES)) - -.PHONY: clean test -clean: - rm -rf *$(EXT_OBJ) *$(EXE) - -test: $(TARGET)$(EXE) - $< +include $(COMMON_BUILD) diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/SimpleXmlPreprocessor/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/SimpleXmlPreprocessor/OMakefile index 7c43f83..5e43c31 100644 --- a/trunk/ConsoleDataMigration/sources/tests/googletest/SimpleXmlPreprocessor/OMakefile +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/SimpleXmlPreprocessor/OMakefile @@ -19,11 +19,4 @@ $(TEST_TARGET)$(EXT_OBJ): ../../../ConsoleRestore/$(TEST_TARGET).cpp .DEFAULT: $(TEST_TARGET)$(EXT_OBJ) $(TARGET)$(EXE) -CXXProgram($(TARGET), $(SRC_FILES)) - -.PHONY: clean test -clean: - rm -rf *$(EXT_OBJ) *$(EXE) - -test: $(TARGET)$(EXE) - $< +include $(COMMON_BUILD) \ No newline at end of file diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/XmlCreator/OMakefile b/trunk/ConsoleDataMigration/sources/tests/googletest/XmlCreator/OMakefile index fef7974..8d94881 100644 --- a/trunk/ConsoleDataMigration/sources/tests/googletest/XmlCreator/OMakefile +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/XmlCreator/OMakefile @@ -16,11 +16,4 @@ $(TEST_TARGET)$(EXT_OBJ): ../../../ConsoleRestore/$(TEST_TARGET).cpp .DEFAULT: $(TEST_TARGET)$(EXT_OBJ) $(TARGET)$(EXE) -CXXProgram($(TARGET), $(SRC_FILES)) - -.PHONY: clean test -clean: - rm -rf *$(EXT_OBJ) *$(EXE) - -test: $(TARGET)$(EXE) - $< +include $(COMMON_BUILD) \ No newline at end of file diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/common/build.om b/trunk/ConsoleDataMigration/sources/tests/googletest/common/build.om new file mode 100644 index 0000000..b97f5cb --- /dev/null +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/common/build.om @@ -0,0 +1,8 @@ +CXXProgram($(TARGET), $(SRC_FILES)) + +.PHONY: clean test +clean: + rm -rf *$(EXT_OBJ) *$(EXE) + +test: $(TARGET)$(EXE) + $< diff --git a/trunk/ConsoleDataMigration/sources/tests/googletest/common/common.om b/trunk/ConsoleDataMigration/sources/tests/googletest/common/common.om new file mode 100644 index 0000000..9051f44 --- /dev/null +++ b/trunk/ConsoleDataMigration/sources/tests/googletest/common/common.om @@ -0,0 +1,7 @@ +CXX = g++-4 + +# gtestのインストール先を指定 +LDFLAGS += -L/usr/local/lib -lgtest -lgtest_main + +COMMON_DIR = $(dir common) +COMMON_BUILD = $(COMMON_DIR)/build.om \ No newline at end of file