Skip to content

Commit 78412e7

Browse files
committed
[CMAKE]
- get rid of the no longer needed importlibs directory - exclude importlibs from all target in MSVC build svn path=/trunk/; revision=55778
1 parent 8d5f238 commit 78412e7

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

reactos/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,5 @@ else()
222222

223223
file(MAKE_DIRECTORY ${REACTOS_BINARY_DIR}/include/reactos)
224224

225-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
226-
227225
add_dependency_footer()
228226
endif()

reactos/cmake/gcc.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,6 @@ else()
8383
set(ARCH2 ${ARCH})
8484
endif()
8585

86-
# Linking
87-
if(ARCH MATCHES i386)
88-
link_directories(${REACTOS_SOURCE_DIR}/importlibs)
89-
endif()
90-
91-
link_directories(${REACTOS_BINARY_DIR}/lib/sdk/crt)
92-
9386
get_target_property(RSYM native-rsym IMPORTED_LOCATION_NOCONFIG)
9487

9588
set(CMAKE_C_LINK_EXECUTABLE

reactos/cmake/msvc.cmake

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ else()
4444
set(SPEC2DEF_ARCH i386)
4545
endif()
4646

47-
link_directories(${REACTOS_SOURCE_DIR}/importlibs ${REACTOS_BINARY_DIR}/importlibs ${REACTOS_BINARY_DIR}/lib/sdk/crt)
48-
4947
set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <DEFINES> /I${REACTOS_SOURCE_DIR}/include/psdk /I${REACTOS_BINARY_DIR}/include/psdk /I${REACTOS_SOURCE_DIR}/include /I${REACTOS_SOURCE_DIR}/include/reactos /I${REACTOS_BINARY_DIR}/include/reactos /I${REACTOS_SOURCE_DIR}/include/reactos/wine /I${REACTOS_SOURCE_DIR}/include/crt /I${REACTOS_SOURCE_DIR}/include/crt/mingw32 /fo <OBJECT> <SOURCE>")
5048

5149
if(MSVC_IDE)
@@ -149,7 +147,7 @@ function(add_importlib_target _exports_file _implib_name)
149147

150148
# add our library
151149
# NOTE: as stub file and def file are generated in one pass, depending on one is like depending on the other
152-
add_library(lib${_name} STATIC
150+
add_library(lib${_name} STATIC EXCLUDE_FROM_ALL
153151
${CMAKE_CURRENT_BINARY_DIR}/lib${_name}_stubs.asm)
154152

155153
# Add necessary importlibs for redirections. Still necessary ?
@@ -188,8 +186,6 @@ macro(macro_mc FLAG FILE)
188186
set(COMMAND_MC mc ${FLAG} -r ${REACTOS_BINARY_DIR}/include/reactos -h ${REACTOS_BINARY_DIR}/include/reactos ${CMAKE_CURRENT_SOURCE_DIR}/${FILE}.mc)
189187
endmacro()
190188

191-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/importlibs)
192-
193189
#pseh workaround
194190
set(PSEH_LIB "pseh")
195191

0 commit comments

Comments
 (0)