summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-07-18 10:12:25 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-07-18 10:12:25 +0200
commitde4e1cb93cb73a247858a1afb950d5ae86acdc41 (patch)
treefe2bf4f03b40e67c7533e3d47703259a4c0e61f3
parente70cb063503100f8241b6b1b7cc75944afb62fe6 (diff)
cmake: adjust paths for main executable dependencies
-rw-r--r--cmake/opentrack-install.cmake6
-rw-r--r--gui/CMakeLists.txt2
-rw-r--r--opentrack-compat/CMakeLists.txt2
-rw-r--r--opentrack-logic/CMakeLists.txt2
-rw-r--r--opentrack/CMakeLists.txt2
-rw-r--r--pose-widget/CMakeLists.txt2
-rw-r--r--qxt-mini/CMakeLists.txt2
-rw-r--r--spline-widget/CMakeLists.txt2
8 files changed, 10 insertions, 10 deletions
diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake
index a6ad1bad..a8ab394c 100644
--- a/cmake/opentrack-install.cmake
+++ b/cmake/opentrack-install.cmake
@@ -6,10 +6,10 @@ if(WIN32)
install(FILES "${CMAKE_SOURCE_DIR}/bin/cleye.config" DESTINATION .)
endif()
-install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION ${opentrack-hier-doc})
+install(FILES ${CMAKE_SOURCE_DIR}/README.md DESTINATION ${opentrack-doc-pfx})
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty-notices DESTINATION ${opentrack-hier-doc})
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/settings" "${CMAKE_SOURCE_DIR}/contrib" DESTINATION ${opentrack-hier-doc})
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty-notices DESTINATION ${opentrack-doc-pfx})
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/settings" "${CMAKE_SOURCE_DIR}/contrib" DESTINATION ${opentrack-doc-pfx})
install(FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll" DESTINATION ${opentrack-hier-pfx} ${opentrack-perms})
install(FILES
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 6ea4a67f..6fa8d034 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -32,5 +32,5 @@ if(LINUX)
target_link_libraries(opentrack procps)
endif()
-opentrack_boilerplate(opentrack STAGE2)
+opentrack_boilerplate(opentrack STAGE2 BIN)
diff --git a/opentrack-compat/CMakeLists.txt b/opentrack-compat/CMakeLists.txt
index ab3278a3..6f745701 100644
--- a/opentrack-compat/CMakeLists.txt
+++ b/opentrack-compat/CMakeLists.txt
@@ -1,4 +1,4 @@
-opentrack_boilerplate(opentrack-compat NO-COMPAT)
+opentrack_boilerplate(opentrack-compat NO-COMPAT BIN)
if(NOT WIN32 AND NOT APPLE)
target_link_libraries(opentrack-compat rt)
endif()
diff --git a/opentrack-logic/CMakeLists.txt b/opentrack-logic/CMakeLists.txt
index 000276d5..edcc27b3 100644
--- a/opentrack-logic/CMakeLists.txt
+++ b/opentrack-logic/CMakeLists.txt
@@ -1,4 +1,4 @@
-opentrack_boilerplate(opentrack-logic)
+opentrack_boilerplate(opentrack-logic BIN)
target_link_libraries(opentrack-logic opentrack-spline-widget)
if(NOT WIN32)
target_link_libraries(opentrack-logic opentrack-qxt-mini)
diff --git a/opentrack/CMakeLists.txt b/opentrack/CMakeLists.txt
index 13b054ca..5151cbf7 100644
--- a/opentrack/CMakeLists.txt
+++ b/opentrack/CMakeLists.txt
@@ -1,3 +1,3 @@
-opentrack_boilerplate(opentrack-api NO-COMPAT)
+opentrack_boilerplate(opentrack-api NO-COMPAT BIN)
target_link_libraries(opentrack-api opentrack-compat)
target_include_directories(opentrack-api PUBLIC ${CMAKE_BINARY_DIR})
diff --git a/pose-widget/CMakeLists.txt b/pose-widget/CMakeLists.txt
index 279e6f5e..d70c3487 100644
--- a/pose-widget/CMakeLists.txt
+++ b/pose-widget/CMakeLists.txt
@@ -1 +1 @@
-opentrack_boilerplate(opentrack-pose-widget)
+opentrack_boilerplate(opentrack-pose-widget BIN)
diff --git a/qxt-mini/CMakeLists.txt b/qxt-mini/CMakeLists.txt
index cf8b14a0..020788ec 100644
--- a/qxt-mini/CMakeLists.txt
+++ b/qxt-mini/CMakeLists.txt
@@ -1,5 +1,5 @@
if(UNIX OR APPLE)
- opentrack_boilerplate(opentrack-qxt-mini NO-COMPAT)
+ opentrack_boilerplate(opentrack-qxt-mini NO-COMPAT BIN)
if(NOT APPLE)
target_link_libraries(opentrack-qxt-mini X11)
else()
diff --git a/spline-widget/CMakeLists.txt b/spline-widget/CMakeLists.txt
index 437ef854..9168fc45 100644
--- a/spline-widget/CMakeLists.txt
+++ b/spline-widget/CMakeLists.txt
@@ -1,2 +1,2 @@
-opentrack_boilerplate(opentrack-spline-widget NO-COMPAT)
+opentrack_boilerplate(opentrack-spline-widget NO-COMPAT BIN)
target_link_libraries(opentrack-spline-widget opentrack-compat)