Put make install builds in same place as pip installed library

NREL · Oct 9, 2024 · 23e978a · 23e978a
1 parent e34d0b4
commit 23e978a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rosco/__init__.py b/rosco/__init__.py
@@ -12,7 +12,7 @@
 rosco_dir = os.path.dirname( os.path.abspath(__file__) )
 libname = "libdiscon"
 
-lib_path = [os.path.join(rosco_dir, "lib", libname+lib_ext), # pip installs (regular and editable)
+lib_path = [os.path.join(rosco_dir, "lib", libname+lib_ext), # pip installs (regular and editable), `make install` also puts it here
             os.path.join(os.path.dirname( os.path.dirname( rosco_dir )), "local", "lib", libname+lib_ext), # WEIS library
             os.path.join(os.path.dirname( sysconfig.get_path('stdlib') ), libname+lib_ext), # conda installs
             os.path.join(os.path.dirname( sysconfig.get_path('stdlib') ), "lib", libname+lib_ext), # conda installs

diff --git a/rosco/controller/CMakeLists.txt b/rosco/controller/CMakeLists.txt
@@ -108,5 +108,5 @@ set(linuxDefault ${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
 set(windowsDefault ${CMAKE_INSTALL_PREFIX} STREQUAL "C:\\Program Files (x86)")
 if(${linuxDefault} OR ${windowsDefault})
   message("TRUE")
-  set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../")
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../")
 endif()