commit 0d108cf352eb8d1eca188d9131e08a300198cf5f
author Monika Wenger <monika.wenger@gmx.net> Sun Jun 14 23:43:03 2020 +0200
committer Monika Wenger <monika.wenger@gmx.net> Thu Jun 18 20:00:59 2020 +0200
tree 0911e9d324168307ae0e2a30b6b30ceafac0ac3e
parent 78a5e1ccc06bd358e61b6d4c5201ed0e033ddf42

[529313] remove empty external folder

Signed-off-by: Monika Wenger <monika.wenger@gmx.net>

buildsupport/generate_modules_cmake_file.cmake

diff --git a/buildsupport/generate_modules_cmake_file.cmake b/buildsupport/generate_modules_cmake_file.cmake
index e5d318b..b0f4793 100644
--- a/buildsupport/generate_modules_cmake_file.cmake
+++ b/buildsupport/generate_modules_cmake_file.cmake
@@ -37,8 +37,8 @@
   FOREACH(MODULE ${MODULE_LIST})

     SET(WRITE_FILE "${WRITE_FILE}SET(SOURCE_GROUP_BACKUP \"\${SOURCE_GROUP}\")\n")

     SET(WRITE_FILE "${WRITE_FILE}SET(SOURCE_GROUP \"\${SOURCE_GROUP}/${MODULE}\")\n")

-    if (_isExternal)

-      SET(WRITE_FILE "${WRITE_FILE}ADD_SUBDIRECTORY(\"\${FORTE_EXTERNAL_MODULES_DIRECTORY}/${MODULE}\" \"\${CMAKE_CURRENT_BINARY_DIR}/${MODULE}\")\n")

+    if(_isExternal)

+      SET(WRITE_FILE "${WRITE_FILE}ADD_SUBDIRECTORY(\"\${FORTE_EXTERNAL_MODULES_DIRECTORY}/${MODULE}\" \"\${CMAKE_CURRENT_BINARY_DIR}/external/${MODULE}\")\n")

     else()

       SET(WRITE_FILE "${WRITE_FILE}ADD_SUBDIRECTORY(\"\${FORTE_MODULE_PATH}${MODULE}\")\n")

     endif()

src/CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d800487..66c5a96 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -19,12 +19,13 @@
 forte_add_subdirectory(core)

 foreach(FORTE_MODULE_DIR ${FORTE_MODULE_LIST})

   string(COMPARE EQUAL "${FORTE_MODULE_DIR}" external _isExternal)

-  if(_isExternal AND NOT EXISTS ${FORTE_EXTERNAL_MODULES_DIRECTORY})

-    continue()

-  else()

+  if(NOT _isExternal)

     forte_add_subdirectory("${FORTE_MODULE_DIR}")

   endif()

 endforeach(FORTE_MODULE_DIR)

+if(EXISTS ${FORTE_EXTERNAL_MODULES_DIRECTORY})

+  INCLUDE(${CMAKE_BINARY_DIR}/src/external/CMakeLists.txt)

+endif()

 forte_add_subdirectory(stdfblib)

 

 SET(SOURCE_GROUP core)  

src/external/CMakeLists.txt

diff --git a/src/external/CMakeLists.txt b/src/external/CMakeLists.txt
deleted file mode 100644
index 36ae3f1..0000000
--- a/src/external/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-INCLUDE(${CMAKE_BINARY_DIR}/src/external/CMakeLists.txt)
\ No newline at end of file