Skip to content

Commit 4e5677a

Browse files
author
[email protected]
committed
[CMake] Make FOLDER property INHERITED
https://bugs.webkit.org/show_bug.cgi?id=156460 Patch by Fujii Hironori <[email protected]> on 2016-04-11 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. Source/bmalloc: * CMakeLists.txt: Set FOLDER property as a directory property not a target property Source/JavaScriptCore: * CMakeLists.txt: * shell/CMakeLists.txt: * shell/PlatformWin.cmake: Set FOLDER property as a directory property not a target property Source/ThirdParty/ANGLE: * CMakeLists.txt: Set FOLDER property as a directory property not a target property Source/WebCore: * CMakeLists.txt: Set FOLDER property as a directory property not a target property Source/WebKit: * CMakeLists.txt: * PlatformWin.cmake: Set FOLDER property as a directory property not a target property Source/WebKit2: * CMakeLists.txt: Set FOLDER property as a directory property not a target property Source/WTF: * CMakeLists.txt: Set FOLDER directory property Tools: * 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 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@199289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 1013c95 commit 4e5677a

28 files changed

+119
-26
lines changed

‎ChangeLog

+18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
Some CMake targets are not setting the FOLDER property. This causes the
9+
generated projects to be displayed in the top-level folder of the solution.
10+
11+
Making the FOLDER property INHERITED ensures that all the targets
12+
are placed in their proper directories.
13+
14+
* Source/cmake/OptionsCommon.cmake:
15+
Define FOLDER property as a inherited property.
16+
* Source/cmake/WebKitMacros.cmake:
17+
Do not set FOLDER target property.
18+
119
2016-04-08 Alex Christensen <[email protected]>
220

321
Progress towards running CMake WebKit2 on Mac

‎Source/JavaScriptCore/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
include(WebKitCommon)
3+
set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
34

45
set(JavaScriptCore_INCLUDE_DIRECTORIES
56
"${CMAKE_BINARY_DIR}"

‎Source/JavaScriptCore/ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
* shell/CMakeLists.txt:
10+
* shell/PlatformWin.cmake:
11+
Set FOLDER property as a directory property not a target property
12+
113
2016-04-09 Keith Miller <[email protected]>
214

315
tryGetById should be supported by the DFG/FTL

‎Source/JavaScriptCore/shell/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ include_directories(./ ${JavaScriptCore_INCLUDE_DIRECTORIES})
2323
include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
2424
add_executable(jsc ${JSC_SOURCES})
2525
target_link_libraries(jsc ${JSC_LIBRARIES})
26-
set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore")
2726

2827
if (JSC_OUTPUT_NAME)
2928
set_target_properties(jsc PROPERTIES OUTPUT_NAME ${JSC_OUTPUT_NAME})

‎Source/JavaScriptCore/shell/PlatformWin.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ list(APPEND JSC_LIBRARIES
77
)
88

99
target_link_libraries(jscLib ${JSC_LIBRARIES})
10-
set_target_properties(jscLib PROPERTIES FOLDER "JavaScriptCore")
1110

1211
if (${WTF_PLATFORM_WIN_CAIRO})
1312
add_definitions(-DWIN_CAIRO)
@@ -20,7 +19,6 @@ add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
2019
set(JSC_OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
2120

2221
add_library(testRegExpLib SHARED ../testRegExp.cpp)
23-
set_target_properties(testRegExpLib PROPERTIES FOLDER "JavaScriptCore")
2422
add_executable(testRegExp ${JSC_SOURCES})
2523
set_target_properties(testRegExp PROPERTIES OUTPUT_NAME "testRegExp${DEBUG_SUFFIX}")
2624
target_link_libraries(testRegExp shlwapi)
@@ -38,7 +36,6 @@ add_library(testapiLib SHARED
3836
)
3937
set_source_files_properties(../API/tests/CustomGlobalObjectClassTest.c PROPERTIES COMPILE_FLAGS "/TP /MT")
4038
set_source_files_properties(../API/tests/testapi.c PROPERTIES COMPILE_FLAGS "/TP /MT")
41-
set_target_properties(testapiLib PROPERTIES FOLDER "JavaScriptCore")
4239
add_executable(testapi ${JSC_SOURCES})
4340
set_target_properties(testapi PROPERTIES OUTPUT_NAME "testapi${DEBUG_SUFFIX}")
4441
target_link_libraries(testapi shlwapi)

‎Source/ThirdParty/ANGLE/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,4 @@ foreach (_file ${_files_khr})
303303
file(COPY ${_file} DESTINATION ${DERIVED_SOURCES_DIR}/ForwardingHeaders/ANGLE/include/khr)
304304
endforeach ()
305305

306-
set_target_properties(libANGLE PROPERTIES FOLDER "ANGLE")
307-
set_target_properties(libEGL PROPERTIES FOLDER "ANGLE")
308-
set_target_properties(libGLESv2 PROPERTIES FOLDER "ANGLE")
306+
set_property(DIRECTORY . PROPERTY FOLDER "ANGLE")

‎Source/ThirdParty/ANGLE/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
Set FOLDER property as a directory property not a target property
10+
111
2016-03-22 Alberto Garcia <[email protected]>
212

313
Unreviewed typo fix.

‎Source/WTF/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
include(WebKitCommon)
3+
set_property(DIRECTORY . PROPERTY FOLDER "WTF")
34

45
add_subdirectory(wtf)

‎Source/WTF/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
Set FOLDER directory property
10+
111
2016-04-08 Alex Christensen <[email protected]>
212

313
Progress towards running CMake WebKit2 on Mac

‎Source/WebCore/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
include(WebKitCommon)
3+
set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
34

45
set(WebCore_INCLUDE_DIRECTORIES
56
"${WEBCORE_DIR}"
@@ -3806,7 +3807,6 @@ endif ()
38063807
# files on OS X.
38073808
add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
38083809
set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
3809-
set_target_properties(WebCoreDerivedSources PROPERTIES FOLDER "WebCore")
38103810
if (NOT WIN32)
38113811
list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
38123812
endif ()
@@ -3839,7 +3839,6 @@ include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
38393839
add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
38403840
add_dependencies(WebCoreTestSupport WebCore)
38413841
target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
3842-
set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore")
38433842

38443843
if (WebCoreTestSupport_OUTPUT_NAME)
38453844
set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
@@ -3850,7 +3849,6 @@ endif ()
38503849

38513850
if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
38523851
add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
3853-
set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
38543852

38553853
# Suppress null conversion warnings for sources in Source/ThirdParty/ANGLE
38563854
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

‎Source/WebCore/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
Set FOLDER property as a directory property not a target property
10+
111
2016-04-10 Sam Weinig <[email protected]>
212

313
Fix the build.

‎Source/WebKit/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
cmake_minimum_required(VERSION 2.8.12)
22
include(WebKitCommon)
3+
set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
34

45
set(WebKit_SOURCES
56
Storage/StorageAreaImpl.cpp

‎Source/WebKit/ChangeLog

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
* PlatformWin.cmake:
10+
Set FOLDER property as a directory property not a target property
11+
112
2016-04-08 Alex Christensen <[email protected]>
213

314
Progress towards running CMake WebKit2 on Mac

‎Source/WebKit/PlatformWin.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ add_library(WebKitGUID STATIC
409409
"${DERIVED_SOURCES_WEBKIT_DIR}/Interfaces/AccessibleText2_i.c"
410410
)
411411
set_target_properties(WebKitGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
412-
set_target_properties(WebKitGUID PROPERTIES FOLDER "WebKit")
413412

414413
list(APPEND WebKit_LIBRARIES
415414
PRIVATE Comctl32

‎Source/WebKit2/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
2+
13
set(WebKit2_INCLUDE_DIRECTORIES
24
"${JAVASCRIPTCORE_DIR}/llint"
35
"${WEBKIT2_DIR}"
@@ -853,7 +855,6 @@ endif ()
853855
add_executable(WebProcess ${WebProcess_SOURCES})
854856
add_webkit2_prefix_header(WebProcess)
855857
target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
856-
set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
857858

858859
if (WebKit2_WebProcess_OUTPUT_NAME)
859860
set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
@@ -862,7 +863,6 @@ endif ()
862863
add_executable(NetworkProcess ${NetworkProcess_SOURCES})
863864
add_webkit2_prefix_header(NetworkProcess)
864865
target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
865-
set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
866866

867867
if (WebKit2_NetworkProcess_OUTPUT_NAME)
868868
set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
@@ -873,7 +873,6 @@ if (ENABLE_PLUGIN_PROCESS AND NOT APPLE)
873873
add_executable(PluginProcess ${PluginProcess_SOURCES})
874874
add_webkit2_prefix_header(PluginProcess)
875875
target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
876-
set_target_properties(PluginProcess PROPERTIES FOLDER "WebKit")
877876
install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
878877

879878
if (WebKit2_PluginProcess_OUTPUT_NAME)
@@ -886,7 +885,6 @@ if (ENABLE_DATABASE_PROCESS AND NOT APPLE)
886885
add_executable(DatabaseProcess ${DatabaseProcess_SOURCES})
887886
add_webkit2_prefix_header(DatabaseProcess)
888887
target_link_libraries(DatabaseProcess ${DatabaseProcess_LIBRARIES})
889-
set_target_properties(DatabaseProcess PROPERTIES FOLDER "WebKit")
890888
install(TARGETS DatabaseProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
891889

892890
if (WebKit2_DatabaseProcess_OUTPUT_NAME)

‎Source/WebKit2/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
Set FOLDER property as a directory property not a target property
10+
111
2016-04-08 Sam Weinig <[email protected]>
212

313
Remove support for custom target picker actions

‎Source/bmalloc/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set_property(DIRECTORY . PROPERTY FOLDER "bmalloc")
2+
13
set(bmalloc_INCLUDE_DIRECTORIES
24
"${BMALLOC_DIR}"
35
)

‎Source/bmalloc/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
Set FOLDER property as a directory property not a target property
10+
111
2016-04-08 Geoffrey Garen <[email protected]>
212

313
bmalloc: stress_aligned test fails if you increase smallMax

‎Source/cmake/OptionsCommon.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if ("${AR_VERSION}" MATCHES "^GNU ar")
2424
endif ()
2525

2626
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
27+
define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
2728

2829
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
2930
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing")

‎Source/cmake/WebKitMacros.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ macro(WEBKIT_FRAMEWORK _target)
252252
)
253253
target_link_libraries(${_target} ${${_target}_LIBRARIES})
254254
set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
255-
set_target_properties(${_target} PROPERTIES FOLDER "${_target}")
256255

257256
if (${_target}_OUTPUT_NAME)
258257
set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})

‎Tools/CMakeLists.txt

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set_property(DIRECTORY . PROPERTY FOLDER "Tools")
2+
13
if ("${PORT}" STREQUAL "Efl")
24
if (DEVELOPER_MODE)
35
add_subdirectory(WebKitTestRunner)

‎Tools/ChangeLog

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
2016-04-11 Fujii Hironori <[email protected]>
2+
3+
[CMake] Make FOLDER property INHERITED
4+
https://bugs.webkit.org/show_bug.cgi?id=156460
5+
6+
Reviewed by Brent Fulgham.
7+
8+
* CMakeLists.txt:
9+
* DumpRenderTree/CMakeLists.txt:
10+
* DumpRenderTree/PlatformWin.cmake:
11+
* ImageDiff/CMakeLists.txt:
12+
* MiniBrowser/efl/CMakeLists.txt:
13+
* MiniBrowser/gtk/CMakeLists.txt:
14+
* MiniBrowser/win/CMakeLists.txt:
15+
Set FOLDER property as a directory property not a target property
16+
117
2016-04-10 Caitlin Potter <[email protected]>
218

319
[Tools] correctly check for braces in multiline branches in macro definition

‎Tools/DumpRenderTree/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,9 @@ include_directories(${DumpRenderTree_INCLUDE_DIRECTORIES})
110110

111111
add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
112112
target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
113-
set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
114113

115114
add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
116115
target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
117-
set_target_properties(TestNetscapePlugin PROPERTIES FOLDER "Tools")
118116

119117
if (WIN32)
120118
add_dependencies(DumpRenderTree DumpRenderTreeLib)

‎Tools/DumpRenderTree/PlatformWin.cmake

-3
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,13 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT
129129
add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
130130

131131
add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
132-
set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
133132
target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
134133

135134
add_executable(ImageDiff ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
136135
target_link_libraries(ImageDiff shlwapi)
137-
set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
138136
set_target_properties(ImageDiff PROPERTIES OUTPUT_NAME "ImageDiff")
139137

140138
add_library(ImageDiffLib SHARED ${ImageDiff_SOURCES})
141-
set_target_properties(ImageDiffLib PROPERTIES FOLDER "Tools")
142139
target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
143140

144141
add_dependencies(ImageDiff ImageDiffLib)

‎Tools/ImageDiff/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES})
1717
include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES})
1818
add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
1919
target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
20-
set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")

‎Tools/MiniBrowser/efl/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,4 @@ if (ELEMENTARY_FOUND)
6767
include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
6868
add_executable(MiniBrowser ${MiniBrowser_SOURCES})
6969
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
70-
set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
7170
endif ()

‎Tools/MiniBrowser/gtk/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,5 @@ include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
5858
include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
5959
add_executable(MiniBrowser ${MiniBrowser_SOURCES})
6060
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
61-
set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
6261

6362
install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")

‎Tools/MiniBrowser/win/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,9 @@ add_definitions(-D_UNICODE)
5353
include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
5454
add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
5555
target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
56-
set_target_properties(MiniBrowserLib PROPERTIES FOLDER "Tools")
5756

5857
add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp ../MiniBrowser.vcxproj/MiniBrowser.rc)
5958
target_link_libraries(MiniBrowser shlwapi)
60-
set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
6159
set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
6260

6361
add_dependencies(MiniBrowser MiniBrowserLib)

0 commit comments

Comments
 (0)