Home Explore Help
Sign In
maoting
/
CTK
Watch 1
Star 1
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Ensure "CMAKE_INSTALL_PREFIX" is properly passed to inner project.

The value of "ep_install_dir" is reserved for regular
external project. The user should still be able to set
CMAKE_INSTALL_PREFIX when configuring CTK and have it
installed when he expects.

See issue #65
Jean-Christophe Fillion-Robin 13 years ago
parent
de2625bc30
commit
c9543afc17
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      SuperBuild.cmake

+ 1 - 1
SuperBuild.cmake
View File 

@@ -157,7 +157,7 @@ ExternalProject_Add(${proj}
 
     -DCMAKE_C_FLAGS_INIT:STRING=${CMAKE_C_FLAGS_INIT}
 
     -DCMAKE_C_FLAGS_INIT:STRING=${CMAKE_C_FLAGS_INIT}
 
     -DADDITIONAL_C_FLAGS:STRING=${ADDITIONAL_C_FLAGS}
 
     -DADDITIONAL_C_FLAGS:STRING=${ADDITIONAL_C_FLAGS}
 
     -DADDITIONAL_CXX_FLAGS:STRING=${ADDITIONAL_CXX_FLAGS}
 
     -DADDITIONAL_CXX_FLAGS:STRING=${ADDITIONAL_CXX_FLAGS}
 
-    -DCMAKE_INSTALL_PREFIX:PATH=${ep_install_dir}
 
+    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
 
     -DCTK_BUILD_SHARED_LIBS:BOOL=${CTK_BUILD_SHARED_LIBS}
 
     -DCTK_BUILD_SHARED_LIBS:BOOL=${CTK_BUILD_SHARED_LIBS}
 
     ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
 
     ${CMAKE_OSX_EXTERNAL_PROJECT_ARGS}
 
     -DDOCUMENTATION_ARCHIVES_OUTPUT_DIRECTORY:PATH=${DOCUMENTATION_ARCHIVES_OUTPUT_DIRECTORY}
 
     -DDOCUMENTATION_ARCHIVES_OUTPUT_DIRECTORY:PATH=${DOCUMENTATION_ARCHIVES_OUTPUT_DIRECTORY}