From 63fa6d040d072992da8a07c5a3eeccce62b1b7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Wed, 7 Mar 2012 21:46:15 +0000 Subject: [PATCH] [DAMN_IT] - addendum to r56081 svn path=/trunk/; revision=56082 --- rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt | 3 +-- rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt | 3 +-- rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt | 3 +-- rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt | 5 ++--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt index 219031122aa..aca0aa3a598 100644 --- a/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt +++ b/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec) +spec2def(w32kdll_2k3sp2.dll w32kdll_2k3sp2.spec ADD_IMPORTLIB) add_library(w32kdll_2k3sp2 SHARED main.c @@ -9,4 +9,3 @@ add_library(w32kdll_2k3sp2 SHARED set_entrypoint(w32kdll_2k3sp2 0) add_dependencies(w32kdll_2k3sp2 psdk ) -add_importlib_target(w32kdll_2k3sp2.spec w32kdll_2k3sp2.dll) diff --git a/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt index 69f573e892d..a7dc46d3398 100644 --- a/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt +++ b/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(w32kdll_ros.dll w32kdll_ros.spec) +spec2def(w32kdll_ros.dll w32kdll_ros.spec ADD_IMPORTLIB) add_library(w32kdll_ros SHARED main.c @@ -10,4 +10,3 @@ set_entrypoint(w32kdll_ros 0) target_link_libraries(w32kdll_ros win32ksys) add_dependencies(w32kdll_ros psdk) -add_importlib_target(w32kdll_ros.spec w32kdll_ros.dll) diff --git a/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt index 52917e84814..6fe6e1dca90 100644 --- a/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt +++ b/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt @@ -1,5 +1,5 @@ -spec2def(w32kdll_dll.spec w32kdll_vista.spec) +spec2def(w32kdll_vista.spec w32kdll_vista.spec ADD_IMPORTLIB) add_library(w32kdll_vista SHARED main.c @@ -8,4 +8,3 @@ add_library(w32kdll_vista SHARED set_entrypoint(w32kdll_vista 0) add_dependencies(w32kdll_vista psdk ) -add_importlib_target(w32kdll_vista.spec w32kdll_dll.spec) diff --git a/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt b/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt index fccd98e6604..1c1a4b5d078 100644 --- a/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt +++ b/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt @@ -1,4 +1,4 @@ -spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec) +spec2def(w32kdll_xpsp2.dll w32kdll_xpsp2.spec ADD_IMPORTLIB) add_library(w32kdll_xpsp2 SHARED main.c @@ -6,5 +6,4 @@ add_library(w32kdll_xpsp2 SHARED ${CMAKE_CURRENT_BINARY_DIR}/w32kdll_xpsp2.def) set_entrypoint(w32kdll_xpsp2 0) -add_dependencies(w32kdll_xpsp2 psdk ) -add_importlib_target(w32kdll_xpsp2.spec w32kdll_xpsp2.dll) +add_dependencies(w32kdll_xpsp2 psdk)