Author: akhaldi
Date: Sun May 19 13:43:47 2013
New Revision: 59040
URL:
http://svn.reactos.org/svn/reactos?rev=59040&view=rev
Log:
[CMAKE]
* Add some missing order only dependencies.
Modified:
trunk/reactos/dll/directx/devenum/CMakeLists.txt
trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
trunk/reactos/dll/directx/quartz/CMakeLists.txt
trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt
trunk/reactos/hal/halx86/acpi.cmake
trunk/reactos/hal/halx86/legacy.cmake
trunk/reactos/hal/halx86/up.cmake
Modified: trunk/reactos/dll/directx/devenum/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/devenum/CMakeL…
==============================================================================
--- trunk/reactos/dll/directx/devenum/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/devenum/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47
2013
@@ -1,4 +1,3 @@
-
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
@@ -17,22 +16,8 @@
${CMAKE_CURRENT_BINARY_DIR}/devenum.def)
set_module_type(devenum win32dll UNICODE)
-
-target_link_libraries(devenum
- strmiids
- uuid
- wine)
-
-add_importlibs(devenum
- advapi32
- ole32
- oleaut32
- winmm
- user32
- avicap32
- msvcrt
- kernel32
- ntdll)
-
+target_link_libraries(devenum strmiids uuid wine)
+add_importlibs(devenum advapi32 ole32 oleaut32 winmm user32 avicap32 msvcrt kernel32
ntdll)
add_pch(devenum devenum_private.h)
+add_dependencies(devenum dxsdk)
add_cd_file(TARGET devenum DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/directx/ksproxy/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/CMakeL…
==============================================================================
--- trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ksproxy/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47
2013
@@ -23,10 +23,7 @@
qualityforward.cpp
${CMAKE_CURRENT_BINARY_DIR}/ksproxy.def)
-add_library(ksproxy SHARED
- ${SOURCE}
- ksproxy.rc)
-
+add_library(ksproxy SHARED ${SOURCE} ksproxy.rc)
set_module_type(ksproxy win32dll)
set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
@@ -39,15 +36,6 @@
endif()
target_link_libraries(ksproxy strmiids)
-
-add_importlibs(ksproxy
- advapi32
- ole32
- setupapi
- ksuser
- msvcrt
- kernel32
- ntdll)
-
+add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll)
+add_dependencies(ksproxy dxsdk)
add_cd_file(TARGET ksproxy DESTINATION reactos/system32 FOR all)
-
Modified: trunk/reactos/dll/directx/quartz/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/CMakeLi…
==============================================================================
--- trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/quartz/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47 2013
@@ -43,34 +43,11 @@
${CMAKE_CURRENT_BINARY_DIR}/quartz_strmif_p.c
${CMAKE_CURRENT_BINARY_DIR}/quartz.def)
-add_library(quartz SHARED
- ${SOURCE}
- version.rc)
-
+add_library(quartz SHARED ${SOURCE} version.rc)
set_module_type(quartz win32dll)
-
-target_link_libraries(quartz
- strmiids
- uuid
- wine
- ${PSEH_LIB})
-
-add_importlibs(quartz
- msvcrt
- advapi32
- dsound
- ole32
- oleaut32
- shlwapi
- user32
- gdi32
- advapi32
- msvfw32
- msacm32
- rpcrt4
- kernel32
- ntdll)
-
+target_link_libraries(quartz strmiids uuid wine ${PSEH_LIB})
+add_importlibs(quartz dsound ole32 oleaut32 shlwapi user32 gdi32 advapi32 msvfw32 msacm32
rpcrt4 msvcrt kernel32 ntdll)
+add_dependencies(quartz dxsdk)
add_pch(quartz quartz_private.h)
add_cd_file(TARGET quartz DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciqtz32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mciqtz32/CMakeLists.txt [iso-8859-1] Sun May 19 13:43:47 2013
@@ -14,4 +14,5 @@
set_module_type(mciqtz32 win32dll)
target_link_libraries(mciqtz32 wine strmiids)
add_importlibs(mciqtz32 winmm oleaut32 ole32 user32 gdi32 msvcrt kernel32 ntdll)
+add_dependencies(mciqtz32 dxsdk)
add_cd_file(TARGET mciqtz32 DESTINATION reactos/system32 FOR all)
Modified: trunk/reactos/hal/halx86/acpi.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi.cmake?rev=…
==============================================================================
--- trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/acpi.cmake [iso-8859-1] Sun May 19 13:43:47 2013
@@ -6,7 +6,7 @@
legacy/bus/pcibus.c)
add_object_library(lib_hal_acpi ${HAL_ACPI_SOURCE})
-
+add_dependencies(lib_hal_acpi bugcodes)
#add_pch(lib_hal_acpi include/hal.h)
if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
Modified: trunk/reactos/hal/halx86/legacy.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy.cmake?re…
==============================================================================
--- trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/legacy.cmake [iso-8859-1] Sun May 19 13:43:47 2013
@@ -12,7 +12,7 @@
legacy/halpcat.c)
add_object_library(lib_hal_legacy ${HAL_LEGACY_SOURCE})
-
+add_dependencies(lib_hal_legacy bugcodes)
#add_pch(lib_hal_legacy include/hal.h)
if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
Modified: trunk/reactos/hal/halx86/up.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up.cmake?rev=59…
==============================================================================
--- trunk/reactos/hal/halx86/up.cmake [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/up.cmake [iso-8859-1] Sun May 19 13:43:47 2013
@@ -4,3 +4,4 @@
up/processor.c)
add_object_library(lib_hal_up ${HAL_UP_SOURCE})
+add_dependencies(lib_hal_up bugcodes)