aboutsummaryrefslogtreecommitdiff
blob: d3556c7cb021101b676684496dc5877bb66dac26 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt
index 9367010..17f8892 100644
--- a/commonTools/gtest/CMakeLists.txt
+++ b/commonTools/gtest/CMakeLists.txt
@@ -31,7 +31,7 @@ TRIBITS_ADD_LIBRARY(
   )
 
 #install gtest header into the correct subdir.
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
 
 
 
diff --git a/packages/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt
index da5a791..5693cdc 100644
--- a/packages/kokkos/containers/src/CMakeLists.txt
+++ b/packages/kokkos/containers/src/CMakeLists.txt
@@ -15,7 +15,7 @@ FILE(GLOB HEADERS *.hpp)
 FILE(GLOB HEADERS_IMPL impl/*.hpp)
 FILE(GLOB SOURCES impl/*.cpp)
 
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
 
 INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
 
diff --git a/packages/kokkos/core/src/CMakeLists.txt b/packages/kokkos/core/src/CMakeLists.txt
index 807a01e..7169c30 100644
--- a/packages/kokkos/core/src/CMakeLists.txt
+++ b/packages/kokkos/core/src/CMakeLists.txt
@@ -40,7 +40,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 #-----------------------------------------------------------------------------
 
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
 
 #-----------------------------------------------------------------------------
 
diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt b/packages/kokkos/core/src/impl/CMakeLists.txt
index c543194..f1e57ea 100644
--- a/packages/kokkos/core/src/impl/CMakeLists.txt
+++ b/packages/kokkos/core/src/impl/CMakeLists.txt
@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY(
     DEPLIBS 
     )
 
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
 
 INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
 
diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
index 05554af..fdc2681 100644
--- a/packages/rol/adapters/belos/src/CMakeLists.txt
+++ b/packages/rol/adapters/belos/src/CMakeLists.txt
@@ -40,4 +40,4 @@ IF (ROL_ENABLE_Belos)
   )
 ENDIF()
 
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt b/packages/rol/adapters/epetra/src/CMakeLists.txt
index 016e5ed..c976498 100644
--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
+++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
@@ -43,4 +43,4 @@ IF (ROL_ENABLE_Epetra)
   )
 ENDIF()
 
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt
index 7366185..c186c70 100644
--- a/packages/rol/adapters/sacado/src/CMakeLists.txt
+++ b/packages/rol/adapters/sacado/src/CMakeLists.txt
@@ -38,4 +38,4 @@ IF (ROL_ENABLE_Sacado)
   )
 ENDIF()
 
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt
index 32172f2..5956c01 100644
--- a/packages/rol/adapters/thyra/src/CMakeLists.txt
+++ b/packages/rol/adapters/thyra/src/CMakeLists.txt
@@ -50,4 +50,4 @@ IF (ROL_ENABLE_Thyra)
   )
 ENDIF()
 
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt
index 51c2e92..1b9eab1 100644
--- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
+++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
@@ -39,4 +39,4 @@ IF (ROL_ENABLE_Tpetra)
  )
 ENDIF()
 
-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
index 695b21d..8f2045c 100644
--- a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
@@ -46,7 +46,7 @@ TRIBITS_ADD_LIBRARY(
 )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
 
 ADD_SUBDIRECTORY(main)
 
diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
index db930be..c3cd3b4 100644
--- a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
@@ -34,5 +34,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
 
diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
index ec7f650..a98b073 100644
--- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
@@ -22,5 +22,5 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
 
diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
index e738def..e8ad166 100644
--- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
index 38d9b5c..7b1d105 100644
--- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
@@ -50,7 +50,7 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
 
 # AGS: I moved this to the bottom so that the link order was correct
 # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
diff --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
index 0412574..b15f54a 100644
--- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
index 71c6697..770eb52 100644
--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
@@ -55,7 +55,7 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
 
 INSTALL(FILES ${HEADERS_IMPL} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
index 844088a..398640d 100644
--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
@@ -49,5 +49,5 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
 
diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
index 7162134..4738933 100644
--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
index 854268d..68b3533 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
 )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
index 10868c3..fa854bc 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
@@ -35,5 +35,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
index a60a1a8..6f2d965 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
@@ -37,5 +37,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
index ebea648..e6f5344 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
@@ -36,5 +36,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
index 2b256f1..b27238f 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
@@ -35,5 +35,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
index 2acb307..411ab23 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
@@ -35,5 +35,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
index e9c2a8c..2353f6c 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
@@ -35,5 +35,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
 
diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
index 63ae85d..3978bf5 100644
--- a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
@@ -35,5 +35,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
 
diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
index 90ab292..930279b 100644
--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
index 2582b19..2f35d7a 100644
--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
@@ -19,4 +19,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-  ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
+  ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
index a70b0b8..3f8d6ac 100644
--- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
@@ -63,4 +63,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
index 55a388e..9a5cbfb 100644
--- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
@@ -35,5 +35,5 @@ ENDIF()
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
 
diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
index 33de7e0..d904256 100644
--- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 #INSTALL(FILES ${HEADERS} DESTINATION
-#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
index 4a91d34..c00793d 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
@@ -16,6 +16,6 @@ ENDIF()
 TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 
 INSTALL(FILES stk_config.h DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
index 105822f..f232e2c 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
@@ -83,5 +83,5 @@ TRIBITS_ADD_LIBRARY(
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
 
diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
index 0493a45..6e5673c 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
@@ -81,4 +81,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
index f441b60..e64f34d 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
index 174a0bb..3827f7f 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
@@ -51,4 +51,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
diff --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
index ed25e41..9314e7a 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 #INSTALL(FILES ${HEADERS} DESTINATION
-#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
+#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
diff --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
index 56b7873..8d83357 100644
--- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
index 467dfa1..605aefd 100644
--- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt
index 5a04b77..6a6872e 100644
--- a/packages/stk/stk_io/stk_io/CMakeLists.txt
+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
@@ -79,7 +79,7 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
 
 # AGS: I moved this to the bottom so that the link order was correct
 # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
index beee08b..1d78255 100644
--- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
index 1258631..f3afeb8 100644
--- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
@@ -85,14 +85,13 @@ TRIBITS_ADD_LIBRARY(
 TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
 
 INSTALL(FILES ${HEADERS_IMPL} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
 
 INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION
-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
diff --git a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
index c025e1c..77937c4 100644
--- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
@@ -72,4 +72,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
diff --git a/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
index ae6cc04..199c82f 100644
--- a/packages/stk/stk_search/stk_search/CMakeLists.txt
+++ b/packages/stk/stk_search/stk_search/CMakeLists.txt
@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
index ca6e439..dd460d4 100644
--- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
     
diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
index 647c895..cd55770 100644
--- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
@@ -72,7 +72,7 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
 
 INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
diff --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
index 667cb5d..ce11394 100644
--- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
@@ -5,4 +5,4 @@
 FILE(GLOB HEADERS *.hpp)
 
 INSTALL(FILES ${HEADERS} DESTINATION
-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
index 02f4bf2..e95b05c 100644
--- a/packages/stk/stk_util/stk_util/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/CMakeLists.txt
@@ -18,6 +18,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
 INSTALL(FILES stk_config.h DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
index 41d36f6..146099c 100644
--- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
@@ -76,5 +76,5 @@ TRIBITS_ADD_LIBRARY(
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
 
diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
index 108c464..ef40627 100644
--- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
@@ -74,4 +74,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
index 29da134..e350a7d 100644
--- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
@@ -94,4 +94,4 @@ FILE(GLOB SOURCES *.cpp)
 #  )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
index b616750..412dd0e 100644
--- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
@@ -71,5 +71,5 @@ TRIBITS_ADD_LIBRARY(
 
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
 
diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
index 0629e38..493bd52 100644
--- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
@@ -79,4 +79,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
index b12d75e..054f60d 100644
--- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY(
   )
 
 INSTALL(FILES ${HEADERS} DESTINATION
-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
index 030a7c6..c0d49dc 100644
--- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
@@ -27,7 +27,7 @@ TRIBITS_ADD_LIBRARY(
 # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
 # installation.
 
-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
 
 INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/)
 
diff --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt
index 3b8c4fd..175f736 100644
--- a/packages/trios/libraries/support/CMakeLists.txt
+++ b/packages/trios/libraries/support/CMakeLists.txt
@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY(
 
 ########### install targets ###############
 
-# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+# INSTALL(FILES ${MODULES} DESTINATION include)
 
 TRIBITS_SUBPACKAGE_POSTPROCESS()
diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
index e3993d9..af1554f 100644
--- a/packages/zoltan/src/CMakeLists.txt
+++ b/packages/zoltan/src/CMakeLists.txt
@@ -678,5 +678,5 @@ TRIBITS_ADD_LIBRARY(
   IMPORTEDLIBS ${IMPORTEDLIBS}
   )
 
-INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+INSTALL(FILES ${MODULES} DESTINATION include)
 
diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt
index 32913f3..8dd9cba 100644
--- a/packages/zoltan/src/fdriver/CMakeLists.txt
+++ b/packages/zoltan/src/fdriver/CMakeLists.txt
@@ -33,6 +33,6 @@ IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
 
 #  What is a good location for executables zdrive and zCPPdrive?
 #  When should they be moved there?  During install?  Or build?
-#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
 
 ENDIF()