Kouhei Sutou
null+****@clear*****
Sat Oct 7 13:55:20 JST 2017
Kouhei Sutou 2017-10-07 13:55:20 +0900 (Sat, 07 Oct 2017) New Revision: 98df5025fa436dd00ae5cd9ea9a270a3de55dc2d https://github.com/pgroonga/pgroonga/commit/98df5025fa436dd00ae5cd9ea9a270a3de55dc2d Message: windows: /EHsc is needless for .rc Modified files: CMakeLists.txt Modified: CMakeLists.txt (+6 -6) =================================================================== --- CMakeLists.txt 2017-10-07 13:42:41 +0900 (23653eb) +++ CMakeLists.txt 2017-10-07 13:55:20 +0900 (3413906) @@ -82,6 +82,9 @@ string(REGEX REPLACE "^.*=[ \t]*\\\\" "" string(REGEX REPLACE "[ \t\n]" "" PGRN_CHECK_SOURCES "${PGRN_CHECK_SOURCES}") string(REGEX REPLACE "\\\\" ";" PGRN_CHECK_SOURCES "${PGRN_CHECK_SOURCES}") +set_source_files_properties(${PGRN_SOURCES} + PROPERTIES + COMPILE_FLAGS "/EHsc") configure_file( "src/pgroonga.rc.in" "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga.rc" @@ -89,9 +92,6 @@ configure_file( set(PGRN_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga.rc" ${PGRN_SOURCES}) -set_source_files_properties(${PGRN_SOURCES} - PROPERTIES - COMPILE_FLAGS "/EHsc") add_library("${PGRN_LIBRARY_NAME}" SHARED ${PGRN_SOURCES}) set_target_properties("${PGRN_LIBRARY_NAME}" PROPERTIES @@ -103,6 +103,9 @@ target_link_libraries("${PGRN_LIBRARY_NAME}" install(TARGETS "${PGRN_LIBRARY_NAME}" DESTINATION "${PGRN_EXTENSION_DIR}") +set_source_files_properties(${PGRN_CHECK_SOURCES} + PROPERTIES + COMPILE_FLAGS "/EHsc") configure_file( "src/pgroonga-check.rc.in" "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga-check.rc" @@ -110,9 +113,6 @@ configure_file( set(PGRN_CHECK_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga-check.rc" ${PGRN_CHECK_SOURCES}) -set_source_files_properties(${PGRN_CHECK_SOURCES} - PROPERTIES - COMPILE_FLAGS "/EHsc") add_library("${PGRN_CHECK_LIBRARY_NAME}" SHARED ${PGRN_CHECK_SOURCES}) set_target_properties("${PGRN_CHECK_LIBRARY_NAME}" PROPERTIES -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171007/770b6bd6/attachment-0001.htm