aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2013-07-02 02:02:57 -0700
committerChris Robinson <[email protected]>2013-07-02 02:02:57 -0700
commit61c6a38f041ac5b7cf265eb718763d550119cf70 (patch)
treeeeeebbf86d2c15f010f9cc028d57462668dfbfdd
parentf23a28e8f327ff14dc05d7c2c4fcb34a8262ca69 (diff)
Don't have ../../ as part of the target name
-rw-r--r--CMakeLists.txt2
-rw-r--r--utils/alsoft-config/CMakeLists.txt7
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41519975..41d4cbd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -875,7 +875,7 @@ IF(ALSOFT_UTILS)
)
MESSAGE(STATUS "Building utility programs")
- IF(TARGET ../../alsoft-config)
+ IF(TARGET alsoft-config)
MESSAGE(STATUS "Building configuration program")
ENDIF()
MESSAGE(STATUS "")
diff --git a/utils/alsoft-config/CMakeLists.txt b/utils/alsoft-config/CMakeLists.txt
index 1a5085a4..a6707a3d 100644
--- a/utils/alsoft-config/CMakeLists.txt
+++ b/utils/alsoft-config/CMakeLists.txt
@@ -17,10 +17,11 @@ if(QT4_FOUND)
set(alsoft-config_MOCS mainwindow.h)
QT4_WRAP_CPP(MOCS ${alsoft-config_MOCS})
- add_executable(../../alsoft-config ${alsoft-config_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
- target_link_libraries(../../alsoft-config ${QT_LIBRARIES})
+ add_executable(alsoft-config ${alsoft-config_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
+ target_link_libraries(alsoft-config ${QT_LIBRARIES})
+ set_target_properties(alsoft-config PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${OpenAL_BINARY_DIR})
- install(TARGETS ../../alsoft-config
+ install(TARGETS alsoft-config
RUNTIME DESTINATION bin
LIBRARY DESTINATION "lib${LIB_SUFFIX}"
ARCHIVE DESTINATION "lib${LIB_SUFFIX}"