kolan
/
cmake.backbone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Regression fixed. Introduced in e94a91ba7e. 

Leads to 'dependency library not found' for dlls on windows.
This commit is contained in:
Kolan Sh 2016-09-02 18:00:19 +03:00
parent 5a8221f571
commit 202aa6314f
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ValaLibCommonRules.cmake
View File

@ -8,6 +8,13 @@ IF (NOT LibNoApi)
SET (generate_header ${LibName}-${MAJOR}) SET (generate_header ${LibName}-${MAJOR})
ENDIF (NOT LibNoApi) ENDIF (NOT LibNoApi)
IF (WIN32)
IF (NOT LibIsPlugin)
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/run") # Avoid of "dll not found" messages
ENDIF (NOT LibIsPlugin)
ENDIF (WIN32)
VALA_PRECOMPILE (VALA_C ${LibSources} VALA_PRECOMPILE (VALA_C ${LibSources}
PACKAGES ${LibPackages} PACKAGES ${LibPackages}
OPTIONS --thread ${LibValaOpts} ${VALA_DEBUG} ${export_vaapi} OPTIONS --thread ${LibValaOpts} ${VALA_DEBUG} ${export_vaapi}
@ -24,9 +31,6 @@ SET_TARGET_PROPERTIES (${LibName} PROPERTIES VERSION ${MAJOR}.${MINOR}.${PATCH})
SET_TARGET_PROPERTIES (${LibName} PROPERTIES SOVERSION ${MAJOR}) SET_TARGET_PROPERTIES (${LibName} PROPERTIES SOVERSION ${MAJOR})
IF (WIN32) IF (WIN32)
IF (NOT LibIsPlugin)
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/run") # Avoid of "dll not found" messages
ENDIF (NOT LibIsPlugin)
SET_TARGET_PROPERTIES (${LibName} PROPERTIES PREFIX "" IMPORT_PREFIX "" SET_TARGET_PROPERTIES (${LibName} PROPERTIES PREFIX "" IMPORT_PREFIX ""
SUFFIX "-${MAJOR}.dll" IMPORT_SUFFIX "-${MAJOR}.dll.a") SUFFIX "-${MAJOR}.dll" IMPORT_SUFFIX "-${MAJOR}.dll.a")
ENDIF (WIN32) ENDIF (WIN32)