Diff
Modified: trunk/ChangeLog (199288 => 199289)
--- trunk/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,21 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ Some CMake targets are not setting the FOLDER property. This causes the
+ generated projects to be displayed in the top-level folder of the solution.
+
+ Making the FOLDER property INHERITED ensures that all the targets
+ are placed in their proper directories.
+
+ * Source/cmake/OptionsCommon.cmake:
+ Define FOLDER property as a inherited property.
+ * Source/cmake/WebKitMacros.cmake:
+ Do not set FOLDER target property.
+
2016-04-08 Alex Christensen <[email protected]>
Progress towards running CMake WebKit2 on Mac
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (199288 => 199289)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 2.8.12)
include(WebKitCommon)
+set_property(DIRECTORY . PROPERTY FOLDER "_javascript_Core")
set(_javascript_Core_INCLUDE_DIRECTORIES
"${CMAKE_BINARY_DIR}"
Modified: trunk/Source/_javascript_Core/ChangeLog (199288 => 199289)
--- trunk/Source/_javascript_Core/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,15 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * shell/CMakeLists.txt:
+ * shell/PlatformWin.cmake:
+ Set FOLDER property as a directory property not a target property
+
2016-04-09 Keith Miller <[email protected]>
tryGetById should be supported by the DFG/FTL
Modified: trunk/Source/_javascript_Core/shell/CMakeLists.txt (199288 => 199289)
--- trunk/Source/_javascript_Core/shell/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/_javascript_Core/shell/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -23,7 +23,6 @@
include_directories(SYSTEM ${_javascript_Core_SYSTEM_INCLUDE_DIRECTORIES})
add_executable(jsc ${JSC_SOURCES})
target_link_libraries(jsc ${JSC_LIBRARIES})
-set_target_properties(jsc PROPERTIES FOLDER "_javascript_Core")
if (JSC_OUTPUT_NAME)
set_target_properties(jsc PROPERTIES OUTPUT_NAME ${JSC_OUTPUT_NAME})
Modified: trunk/Source/_javascript_Core/shell/PlatformWin.cmake (199288 => 199289)
--- trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2016-04-11 07:28:42 UTC (rev 199289)
@@ -7,7 +7,6 @@
)
target_link_libraries(jscLib ${JSC_LIBRARIES})
-set_target_properties(jscLib PROPERTIES FOLDER "_javascript_Core")
if (${WTF_PLATFORM_WIN_CAIRO})
add_definitions(-DWIN_CAIRO)
@@ -20,7 +19,6 @@
set(JSC_OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
add_library(testRegExpLib SHARED ../testRegExp.cpp)
-set_target_properties(testRegExpLib PROPERTIES FOLDER "_javascript_Core")
add_executable(testRegExp ${JSC_SOURCES})
set_target_properties(testRegExp PROPERTIES OUTPUT_NAME "testRegExp${DEBUG_SUFFIX}")
target_link_libraries(testRegExp shlwapi)
@@ -38,7 +36,6 @@
)
set_source_files_properties(../API/tests/CustomGlobalObjectClassTest.c PROPERTIES COMPILE_FLAGS "/TP /MT")
set_source_files_properties(../API/tests/testapi.c PROPERTIES COMPILE_FLAGS "/TP /MT")
-set_target_properties(testapiLib PROPERTIES FOLDER "_javascript_Core")
add_executable(testapi ${JSC_SOURCES})
set_target_properties(testapi PROPERTIES OUTPUT_NAME "testapi${DEBUG_SUFFIX}")
target_link_libraries(testapi shlwapi)
Modified: trunk/Source/ThirdParty/ANGLE/CMakeLists.txt (199288 => 199289)
--- trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/ThirdParty/ANGLE/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -303,6 +303,4 @@
file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
endforeach ()
-set_target_properties(libANGLE PROPERTIES FOLDER "ANGLE")
-set_target_properties(libEGL PROPERTIES FOLDER "ANGLE")
-set_target_properties(libGLESv2 PROPERTIES FOLDER "ANGLE")
+set_property(DIRECTORY . PROPERTY FOLDER "ANGLE")
Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (199288 => 199289)
--- trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,13 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Set FOLDER property as a directory property not a target property
+
2016-03-22 Alberto Garcia <[email protected]>
Unreviewed typo fix.
Modified: trunk/Source/WTF/CMakeLists.txt (199288 => 199289)
--- trunk/Source/WTF/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WTF/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,4 +1,5 @@
cmake_minimum_required(VERSION 2.8.12)
include(WebKitCommon)
+set_property(DIRECTORY . PROPERTY FOLDER "WTF")
add_subdirectory(wtf)
Modified: trunk/Source/WTF/ChangeLog (199288 => 199289)
--- trunk/Source/WTF/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WTF/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,13 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Set FOLDER directory property
+
2016-04-08 Alex Christensen <[email protected]>
Progress towards running CMake WebKit2 on Mac
Modified: trunk/Source/WebCore/CMakeLists.txt (199288 => 199289)
--- trunk/Source/WebCore/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 2.8.12)
include(WebKitCommon)
+set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
set(WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}"
@@ -3806,7 +3807,6 @@
# files on OS X.
add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
-set_target_properties(WebCoreDerivedSources PROPERTIES FOLDER "WebCore")
if (NOT WIN32)
list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
endif ()
@@ -3839,7 +3839,6 @@
add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
add_dependencies(WebCoreTestSupport WebCore)
target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
-set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore")
if (WebCoreTestSupport_OUTPUT_NAME)
set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
@@ -3850,7 +3849,6 @@
if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
- set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
# Suppress null conversion warnings for sources in Source/ThirdParty/ANGLE
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
Modified: trunk/Source/WebCore/ChangeLog (199288 => 199289)
--- trunk/Source/WebCore/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebCore/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,13 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Set FOLDER property as a directory property not a target property
+
2016-04-10 Sam Weinig <[email protected]>
Fix the build.
Modified: trunk/Source/WebKit/CMakeLists.txt (199288 => 199289)
--- trunk/Source/WebKit/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebKit/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 2.8.12)
include(WebKitCommon)
+set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
set(WebKit_SOURCES
Storage/StorageAreaImpl.cpp
Modified: trunk/Source/WebKit/ChangeLog (199288 => 199289)
--- trunk/Source/WebKit/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebKit/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,14 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ Set FOLDER property as a directory property not a target property
+
2016-04-08 Alex Christensen <[email protected]>
Progress towards running CMake WebKit2 on Mac
Modified: trunk/Source/WebKit/PlatformWin.cmake (199288 => 199289)
--- trunk/Source/WebKit/PlatformWin.cmake 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebKit/PlatformWin.cmake 2016-04-11 07:28:42 UTC (rev 199289)
@@ -409,7 +409,6 @@
"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleText2_i.c"
)
set_target_properties(WebKitGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
-set_target_properties(WebKitGUID PROPERTIES FOLDER "WebKit")
list(APPEND WebKit_LIBRARIES
PRIVATE Comctl32
Modified: trunk/Source/WebKit2/CMakeLists.txt (199288 => 199289)
--- trunk/Source/WebKit2/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebKit2/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,5 @@
+set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
+
set(WebKit2_INCLUDE_DIRECTORIES
"${_javascript_CORE_DIR}/llint"
"${WEBKIT2_DIR}"
@@ -853,7 +855,6 @@
add_executable(WebProcess ${WebProcess_SOURCES})
add_webkit2_prefix_header(WebProcess)
target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
-set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
if (WebKit2_WebProcess_OUTPUT_NAME)
set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
@@ -862,7 +863,6 @@
add_executable(NetworkProcess ${NetworkProcess_SOURCES})
add_webkit2_prefix_header(NetworkProcess)
target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
-set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
if (WebKit2_NetworkProcess_OUTPUT_NAME)
set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
@@ -873,7 +873,6 @@
add_executable(PluginProcess ${PluginProcess_SOURCES})
add_webkit2_prefix_header(PluginProcess)
target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
- set_target_properties(PluginProcess PROPERTIES FOLDER "WebKit")
install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
if (WebKit2_PluginProcess_OUTPUT_NAME)
@@ -886,7 +885,6 @@
add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
add_webkit2_prefix_header(DatabaseProcess)
target_link_libraries(DatabaseProcess ${DatabaseProcess_LIBRARIES})
- set_target_properties(DatabaseProcess PROPERTIES FOLDER "WebKit")
install(TARGETS DatabaseProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
if (WebKit2_DatabaseProcess_OUTPUT_NAME)
Modified: trunk/Source/WebKit2/ChangeLog (199288 => 199289)
--- trunk/Source/WebKit2/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,13 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Set FOLDER property as a directory property not a target property
+
2016-04-08 Sam Weinig <[email protected]>
Remove support for custom target picker actions
Modified: trunk/Source/bmalloc/CMakeLists.txt (199288 => 199289)
--- trunk/Source/bmalloc/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/bmalloc/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,5 @@
+set_property(DIRECTORY . PROPERTY FOLDER "bmalloc")
+
set(bmalloc_INCLUDE_DIRECTORIES
"${BMALLOC_DIR}"
)
Modified: trunk/Source/bmalloc/ChangeLog (199288 => 199289)
--- trunk/Source/bmalloc/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/bmalloc/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,13 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Set FOLDER property as a directory property not a target property
+
2016-04-08 Geoffrey Garen <[email protected]>
bmalloc: stress_aligned test fails if you increase smallMax
Modified: trunk/Source/cmake/OptionsCommon.cmake (199288 => 199289)
--- trunk/Source/cmake/OptionsCommon.cmake 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/cmake/OptionsCommon.cmake 2016-04-11 07:28:42 UTC (rev 199289)
@@ -24,6 +24,7 @@
endif ()
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing")
Modified: trunk/Source/cmake/WebKitMacros.cmake (199288 => 199289)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-04-11 07:28:42 UTC (rev 199289)
@@ -252,7 +252,6 @@
)
target_link_libraries(${_target} ${${_target}_LIBRARIES})
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
- set_target_properties(${_target} PROPERTIES FOLDER "${_target}")
if (${_target}_OUTPUT_NAME)
set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
Modified: trunk/Tools/CMakeLists.txt (199288 => 199289)
--- trunk/Tools/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,5 @@
+set_property(DIRECTORY . PROPERTY FOLDER "Tools")
+
if ("${PORT}" STREQUAL "Efl")
if (DEVELOPER_MODE)
add_subdirectory(WebKitTestRunner)
Modified: trunk/Tools/ChangeLog (199288 => 199289)
--- trunk/Tools/ChangeLog 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/ChangeLog 2016-04-11 07:28:42 UTC (rev 199289)
@@ -1,3 +1,19 @@
+2016-04-11 Fujii Hironori <[email protected]>
+
+ [CMake] Make FOLDER property INHERITED
+ https://bugs.webkit.org/show_bug.cgi?id=156460
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * ImageDiff/CMakeLists.txt:
+ * MiniBrowser/efl/CMakeLists.txt:
+ * MiniBrowser/gtk/CMakeLists.txt:
+ * MiniBrowser/win/CMakeLists.txt:
+ Set FOLDER property as a directory property not a target property
+
2016-04-10 Caitlin Potter <[email protected]>
[Tools] correctly check for braces in multiline branches in macro definition
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (199288 => 199289)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -110,11 +110,9 @@
add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
-set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
-set_target_properties(TestNetscapePlugin PROPERTIES FOLDER "Tools")
if (WIN32)
add_dependencies(DumpRenderTree DumpRenderTreeLib)
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (199288 => 199289)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2016-04-11 07:28:42 UTC (rev 199289)
@@ -129,16 +129,13 @@
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
-set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
add_executable(ImageDiff ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
target_link_libraries(ImageDiff shlwapi)
-set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
set_target_properties(ImageDiff PROPERTIES OUTPUT_NAME "ImageDiff")
add_library(ImageDiffLib SHARED ${ImageDiff_SOURCES})
-set_target_properties(ImageDiffLib PROPERTIES FOLDER "Tools")
target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
add_dependencies(ImageDiff ImageDiffLib)
Modified: trunk/Tools/ImageDiff/CMakeLists.txt (199288 => 199289)
--- trunk/Tools/ImageDiff/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/ImageDiff/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -17,4 +17,3 @@
include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
-set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
Modified: trunk/Tools/MiniBrowser/efl/CMakeLists.txt (199288 => 199289)
--- trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/MiniBrowser/efl/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -67,5 +67,4 @@
include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
add_executable(MiniBrowser ${MiniBrowser_SOURCES})
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
- set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
endif ()
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (199288 => 199289)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -58,6 +58,5 @@
include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
add_executable(MiniBrowser ${MiniBrowser_SOURCES})
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
-set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (199288 => 199289)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-04-11 00:10:17 UTC (rev 199288)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2016-04-11 07:28:42 UTC (rev 199289)
@@ -53,11 +53,9 @@
include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
-set_target_properties(MiniBrowserLib PROPERTIES FOLDER "Tools")
add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp ../MiniBrowser.vcxproj/MiniBrowser.rc)
target_link_libraries(MiniBrowser shlwapi)
-set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
add_dependencies(MiniBrowser MiniBrowserLib)
