kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename the version target for systems that have a version lib

Browse Source
This commit is contained in:
Chris Robinson 2016-12-21 21:56:51 -08:00
parent 080b0cea8b
commit 40f359d159
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1177,7 +1177,7 @@ ENDIF()
FIND_PACKAGE(Git) FIND_PACKAGE(Git)
IF(GIT_FOUND AND EXISTS "${OpenAL_SOURCE_DIR}/.git") IF(GIT_FOUND AND EXISTS "${OpenAL_SOURCE_DIR}/.git")
# Get the current working branch and its latest abbreviated commit hash # Get the current working branch and its latest abbreviated commit hash
ADD_CUSTOM_TARGET(version ADD_CUSTOM_TARGET(build_version
${CMAKE_COMMAND} -D GIT_EXECUTABLE=${GIT_EXECUTABLE} ${CMAKE_COMMAND} -D GIT_EXECUTABLE=${GIT_EXECUTABLE}
-D LIB_VERSION=${LIB_VERSION} -D LIB_VERSION=${LIB_VERSION}
-D SRC=${OpenAL_SOURCE_DIR}/version.h.in -D SRC=${OpenAL_SOURCE_DIR}/version.h.in
@ -1294,8 +1294,8 @@ IF(WIN32 AND NOT LIBTYPE STREQUAL "STATIC")
ENDIF() ENDIF()
TARGET_LINK_LIBRARIES(${LIBNAME} common ${EXTRA_LIBS}) TARGET_LINK_LIBRARIES(${LIBNAME} common ${EXTRA_LIBS})
IF(TARGET version) IF(TARGET build_version)
ADD_DEPENDENCIES(${LIBNAME} version) ADD_DEPENDENCIES(${LIBNAME} build_version)
ENDIF() ENDIF()
IF(ALSOFT_INSTALL) IF(ALSOFT_INSTALL)

4
utils/alsoft-config/CMakeLists.txt
View File

@ -21,8 +21,8 @@ if(QT4_FOUND)
target_link_libraries(alsoft-config ${QT_LIBRARIES}) target_link_libraries(alsoft-config ${QT_LIBRARIES})
set_property(TARGET alsoft-config APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS}) set_property(TARGET alsoft-config APPEND PROPERTY COMPILE_FLAGS ${EXTRA_CFLAGS})
set_target_properties(alsoft-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR}) set_target_properties(alsoft-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR})
if(TARGET version) if(TARGET build_version)
add_dependencies(alsoft-config version) add_dependencies(alsoft-config build_version)
endif() endif()
install(TARGETS alsoft-config install(TARGETS alsoft-config