|
 |
c24a225 |
diff -up psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt.gitversion psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt
|
|
|
c24a225 |
--- psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt.gitversion 2016-05-13 07:56:05.000000000 +0200
|
|
|
c24a225 |
+++ psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/CMakeLists.txt 2016-06-13 02:38:23.432282605 +0200
|
|
|
c24a225 |
@@ -335,7 +335,7 @@ endif()
|
|
|
c24a225 |
|
|
|
c24a225 |
#FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)
|
|
|
c24a225 |
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/psi4 DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
|
|
c24a225 |
-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/psi4-config DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
|
|
c24a225 |
+#INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/psi4-config DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
|
|
|
c24a225 |
|
|
|
c24a225 |
# Install samples directory
|
|
|
c24a225 |
INSTALL(
|
|
|
b088efc |
diff -up psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt.gitversion psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt
|
|
|
c24a225 |
--- psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt.gitversion 2016-05-13 07:56:05.000000000 +0200
|
|
|
c24a225 |
+++ psi4-15fc63cdd5647247282a5e3f4c9a402f17fb9c24/src/bin/psi4/CMakeLists.txt 2016-06-13 02:37:28.521282665 +0200
|
|
|
b088efc |
@@ -1,18 +1,11 @@
|
|
|
b088efc |
# Run the git version script, and update gitversion.h, if it's changed
|
|
|
215a15e |
-add_custom_target(update_version
|
|
|
215a15e |
- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gitversion.py ${PROJECT_SOURCE_DIR}
|
|
|
215a15e |
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/gitversion.h.tmp ${CMAKE_CURRENT_BINARY_DIR}/gitversion.h
|
|
|
215a15e |
- COMMAND ${CMAKE_COMMAND} -E remove ${CMAKE_CURRENT_BINARY_DIR}/gitversion.h.tmp
|
|
|
215a15e |
- COMMENT "Generating Git info")
|
|
|
b088efc |
|
|
|
b088efc |
add_library(versioned_code OBJECT version.cc python.cc psi_start.cc psi4.cc)
|
|
|
215a15e |
-add_dependencies(versioned_code update_version)
|
|
|
215a15e |
add_dependencies(versioned_code mints)
|
|
|
215a15e |
|
|
|
b088efc |
# Versioned code, but for standalone psi4.so (convenient to add psi4.cc to versioned list)
|
|
|
b088efc |
add_library(versioned_code_so OBJECT EXCLUDE_FROM_ALL version.cc python.cc psi_start.cc psi4.cc)
|
|
|
b088efc |
set_property(TARGET versioned_code_so PROPERTY COMPILE_DEFINITIONS MAKE_PYTHON_MODULE)
|
|
|
b088efc |
-add_dependencies(versioned_code_so update_version)
|
|
|
b088efc |
add_dependencies(versioned_code_so mints)
|
|
|
b088efc |
|
|
|
215a15e |
set(headers_list "")
|
|
|
c24a225 |
@@ -66,7 +59,6 @@ list(APPEND
|
|
|
215a15e |
|
|
|
215a15e |
# Executable psi4
|
|
|
b088efc |
add_executable(psi4 $<TARGET_OBJECTS:psi4_objlib> $<TARGET_OBJECTS:versioned_code>)
|
|
|
215a15e |
-add_dependencies(psi4 update_version)
|
|
|
215a15e |
if(CUSTOM_BOOST_BUILD)
|
|
|
215a15e |
add_dependencies(psi4 custom_boost)
|
|
|
215a15e |
endif()
|