Issue simbody#38: fix use of SimTK_INSTALL_PREFIX

Fix the use of SimTK_INSTALL_PREFIX for backward compatibility.
nkoenig · Oct 2, 2013 · ca24c54 · ca24c54
1 parent 7023a2b
commit ca24c54
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -185,12 +185,9 @@ SET(LIB64)
 
 # For backward compatibility, use SimTK_INSTALL_PREFIX if
 # CMAKE_INSTALL_PREFIX hasn't been set.
-IF(NOT CMAKE_INSTALL_PREFIX)
-  IF(SimTK_INSTALL_PREFIX)
-    SET(CMAKE_INSTALL_PREFIX ${SimTK_INSTALL_PREFIX} CACHE STRING 
-        "Install path prefix." FORCE)
-    mark_as_advanced(CMAKE_INSTALL_PREFIX)
-  ENDIF()
+IF(SimTK_INSTALL_PREFIX AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  SET(CMAKE_INSTALL_PREFIX ${SimTK_INSTALL_PREFIX} CACHE PATH
+      "Install path prefix." FORCE)
 ENDIF()
 
 # C compiler is gcc on Linux, gcc or cc on Mac where command line tools